From af3c35cbc07df69c760e200b4a80f4bcc3d183e9 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Tue, 22 Jul 2014 09:14:02 -0400 Subject: [PATCH] More API cleanup and documentation --- hapi-fhir-base/src/changes/changes.xml | 17 +- .../model/dstu/resource/AdverseReaction.java | 14 +- .../uhn/fhir/model/dstu/resource/Alert.java | 4 +- .../dstu/resource/AllergyIntolerance.java | 18 +- .../fhir/model/dstu/resource/Appointment.java | 16 +- .../dstu/resource/AppointmentResponse.java | 10 +- .../model/dstu/resource/Availability.java | 8 +- .../fhir/model/dstu/resource/CarePlan.java | 20 +- .../uhn/fhir/model/dstu/resource/Claim.java | 4 +- .../fhir/model/dstu/resource/Composition.java | 26 +-- .../fhir/model/dstu/resource/ConceptMap.java | 32 ++-- .../fhir/model/dstu/resource/Condition.java | 34 ++-- .../fhir/model/dstu/resource/Conformance.java | 40 ++-- .../fhir/model/dstu/resource/Coverage.java | 22 +-- .../uhn/fhir/model/dstu/resource/Device.java | 22 +-- .../resource/DeviceObservationReport.java | 14 +- .../model/dstu/resource/DiagnosticOrder.java | 40 ++-- .../model/dstu/resource/DiagnosticReport.java | 32 ++-- .../model/dstu/resource/DocumentManifest.java | 30 +-- .../dstu/resource/DocumentReference.java | 56 +++--- .../fhir/model/dstu/resource/Encounter.java | 24 +-- .../model/dstu/resource/FamilyHistory.java | 4 +- .../uhn/fhir/model/dstu/resource/GVFMeta.java | 8 +- .../fhir/model/dstu/resource/GVFVariant.java | 8 +- .../model/dstu/resource/GeneExpression.java | 10 +- .../model/dstu/resource/GeneticAnalysis.java | 10 +- .../uhn/fhir/model/dstu/resource/Group.java | 24 +-- .../model/dstu/resource/ImagingStudy.java | 28 +-- .../model/dstu/resource/Immunization.java | 40 ++-- .../resource/ImmunizationRecommendation.java | 26 +-- .../model/dstu/resource/ListResource.java | 18 +- .../fhir/model/dstu/resource/Location.java | 22 +-- .../uhn/fhir/model/dstu/resource/Media.java | 20 +- .../fhir/model/dstu/resource/Medication.java | 20 +- .../resource/MedicationAdministration.java | 24 +-- .../dstu/resource/MedicationDispense.java | 28 +-- .../dstu/resource/MedicationPrescription.java | 18 +- .../dstu/resource/MedicationStatement.java | 16 +- .../fhir/model/dstu/resource/Microarray.java | 10 +- .../fhir/model/dstu/resource/Observation.java | 42 ++--- .../uhn/fhir/model/dstu/resource/Order.java | 22 +-- .../model/dstu/resource/OrderResponse.java | 16 +- .../model/dstu/resource/Organization.java | 18 +- .../uhn/fhir/model/dstu/resource/Other.java | 12 +- .../uhn/fhir/model/dstu/resource/Patient.java | 38 ++-- .../model/dstu/resource/Practitioner.java | 24 +-- .../fhir/model/dstu/resource/Procedure.java | 12 +- .../uhn/fhir/model/dstu/resource/Profile.java | 30 +-- .../fhir/model/dstu/resource/Provenance.java | 18 +- .../uhn/fhir/model/dstu/resource/Query.java | 6 +- .../model/dstu/resource/Questionnaire.java | 20 +- .../model/dstu/resource/RelatedPerson.java | 20 +- .../fhir/model/dstu/resource/Remittance.java | 6 +- .../model/dstu/resource/SecurityEvent.java | 38 ++-- .../dstu/resource/SequencingAnalysis.java | 12 +- .../model/dstu/resource/SequencingLab.java | 18 +- .../ca/uhn/fhir/model/dstu/resource/Slot.java | 14 +- .../fhir/model/dstu/resource/Specimen.java | 4 +- .../fhir/model/dstu/resource/Substance.java | 18 +- .../uhn/fhir/model/dstu/resource/Supply.java | 18 +- .../ca/uhn/fhir/model/dstu/resource/User.java | 16 +- .../fhir/model/dstu/resource/ValueSet.java | 26 +-- .../rest/gclient/CompositeClientParam.java | 43 +++++ .../uhn/fhir/rest/gclient/CompositeParam.java | 22 +-- .../fhir/rest/gclient/DateClientParam.java | 142 ++++++++++++++ .../ca/uhn/fhir/rest/gclient/DateParam.java | 115 +----------- .../fhir/rest/gclient/NumberClientParam.java | 129 +++++++++++++ .../ca/uhn/fhir/rest/gclient/NumberParam.java | 106 +---------- .../rest/gclient/QuantityClientParam.java | 176 ++++++++++++++++++ .../uhn/fhir/rest/gclient/QuantityParam.java | 149 +-------------- .../rest/gclient/ReferenceClientParam.java | 81 ++++++++ .../uhn/fhir/rest/gclient/ReferenceParam.java | 60 +----- .../fhir/rest/gclient/StringClientParam.java | 92 +++++++++ .../ca/uhn/fhir/rest/gclient/StringParam.java | 65 +------ .../fhir/rest/gclient/TokenClientParam.java | 122 ++++++++++++ .../ca/uhn/fhir/rest/gclient/TokenParam.java | 95 +--------- .../RestfulPatientResourceProviderMore.java | 80 +++++++- .../src/site/xdoc/doc_rest_operations.xml | 74 ++++++-- .../ca/uhn/fhir/jpa/dao/FhirResourceDao.java | 27 +-- .../test/CompleteResourceProviderTest.java | 12 -- .../org.eclipse.wst.common.component | 2 +- .../main/java/ca/uhn/fhir/to/Controller.java | 4 +- .../src/main/resources/vm/resource.vm | 2 +- 83 files changed, 1613 insertions(+), 1250 deletions(-) create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml index 3b989507e9c..13a0dae76cb 100644 --- a/hapi-fhir-base/src/changes/changes.xml +++ b/hapi-fhir-base/src/changes/changes.xml @@ -8,7 +8,22 @@ - Allow server methods to return wildcard genrric types (e.g. List<? extends IResource>) + RESTful search method parameters have been overhauled to reduce confusing duplicate names and + having multiple ways of accomplishing the same thing. This means that a number of existing classes + have been deprocated in favour of new naming schemes. +
]]> + All annotation-based clients and all server search method parameters are now named + (type)Param, for example: StringParam, TokenParam, etc. +
]]> + All generic/fluent client method parameters are now named + (type)ClientParam, for example: StringClientParam, TokenClientParam, etc. +
]]> + All renamed classes have been retained and deprocated, so this change should not cause any issues + for existing applications but those applications should be refactored to use the + new parameters when possible. + + + Allow server methods to return wildcard generic types (e.g. List<? extends IResource>) Search parameters are not properly escaped and unescaped. E.g. for a token parameter such as 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 7eb2912405a..ab52f3e1949 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 @@ -63,9 +63,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -110,7 +110,7 @@ public class AdverseReaction extends BaseResource implements IResource { * Path: AdverseReaction.symptom.code
*

*/ - public static final TokenParam SYMPTOM = new TokenParam(SP_SYMPTOM); + public static final TokenClientParam SYMPTOM = new TokenClientParam(SP_SYMPTOM); /** * Search parameter constant for substance @@ -131,7 +131,7 @@ public class AdverseReaction extends BaseResource implements IResource { * Path: AdverseReaction.exposure.substance
*

*/ - public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE); + public static final ReferenceClientParam SUBSTANCE = new ReferenceClientParam(SP_SUBSTANCE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -158,7 +158,7 @@ public class AdverseReaction extends BaseResource implements IResource { * Path: AdverseReaction.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for subject @@ -179,7 +179,7 @@ public class AdverseReaction extends BaseResource implements IResource { * Path: AdverseReaction.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 e5185c42fc0..53e7faf1886 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 @@ -55,7 +55,7 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -100,7 +100,7 @@ public class Alert extends BaseResource implements IResource { * Path: Alert.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 684c5b6a408..3b8386ec774 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 @@ -58,9 +58,9 @@ import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -105,7 +105,7 @@ public class AllergyIntolerance extends BaseResource implements IResource { * Path: AllergyIntolerance.sensitivityType
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for substance @@ -126,7 +126,7 @@ public class AllergyIntolerance extends BaseResource implements IResource { * Path: AllergyIntolerance.substance
*

*/ - public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE); + public static final ReferenceClientParam SUBSTANCE = new ReferenceClientParam(SP_SUBSTANCE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -153,7 +153,7 @@ public class AllergyIntolerance extends BaseResource implements IResource { * Path: AllergyIntolerance.recordedDate
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for status @@ -174,7 +174,7 @@ public class AllergyIntolerance extends BaseResource implements IResource { * Path: AllergyIntolerance.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for subject @@ -195,7 +195,7 @@ public class AllergyIntolerance extends BaseResource implements IResource { * Path: AllergyIntolerance.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -222,7 +222,7 @@ public class AllergyIntolerance extends BaseResource implements IResource { * Path: AllergyIntolerance.recorder
*

*/ - public static final ReferenceParam RECORDER = new ReferenceParam(SP_RECORDER); + public static final ReferenceClientParam RECORDER = new ReferenceClientParam(SP_RECORDER); /** * Constant for fluent queries to be used to add include statements. Specifies 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 95d226cd6b6..b2701feed2a 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 @@ -64,10 +64,10 @@ import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -112,7 +112,7 @@ public class Appointment extends BaseResource implements IResource { * Path: Appointment.start
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for status @@ -133,7 +133,7 @@ public class Appointment extends BaseResource implements IResource { * Path: Appointment.status
*

*/ - public static final StringParam STATUS = new StringParam(SP_STATUS); + public static final StringClientParam STATUS = new StringClientParam(SP_STATUS); /** * Search parameter constant for subject @@ -154,7 +154,7 @@ public class Appointment extends BaseResource implements IResource { * Path: Appointment.participant.individual
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -181,7 +181,7 @@ public class Appointment extends BaseResource implements IResource { * Path: Appointment.participant.status
*

*/ - public static final TokenParam PARTSTATUS = new TokenParam(SP_PARTSTATUS); + public static final TokenClientParam PARTSTATUS = new TokenClientParam(SP_PARTSTATUS); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 e6dd83fa44d..c66349c763a 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 @@ -60,8 +60,8 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -106,7 +106,7 @@ public class AppointmentResponse extends BaseResource implements IResource { * Path: AppointmentResponse.participantStatus
*

*/ - public static final StringParam PARTSTATUS = new StringParam(SP_PARTSTATUS); + public static final StringClientParam PARTSTATUS = new StringClientParam(SP_PARTSTATUS); /** * Search parameter constant for subject @@ -127,7 +127,7 @@ public class AppointmentResponse extends BaseResource implements IResource { * Path: AppointmentResponse.individual
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -154,7 +154,7 @@ public class AppointmentResponse extends BaseResource implements IResource { * Path: AppointmentResponse.appointment
*

*/ - public static final ReferenceParam APPOINTMENT = new ReferenceParam(SP_APPOINTMENT); + public static final ReferenceClientParam APPOINTMENT = new ReferenceClientParam(SP_APPOINTMENT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 34392a22a47..2eaed3e7d9e 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 @@ -56,8 +56,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -102,7 +102,7 @@ public class Availability extends BaseResource implements IResource { * Path: Availability.individual
*

*/ - public static final ReferenceParam INDIVIDUAL = new ReferenceParam(SP_INDIVIDUAL); + public static final ReferenceClientParam INDIVIDUAL = new ReferenceClientParam(SP_INDIVIDUAL); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -129,7 +129,7 @@ public class Availability extends BaseResource implements IResource { * Path: Availability.type
*

*/ - public static final TokenParam SLOTTYPE = new TokenParam(SP_SLOTTYPE); + public static final TokenClientParam SLOTTYPE = new TokenClientParam(SP_SLOTTYPE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 9575309860c..2a013d37bf9 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 @@ -71,9 +71,9 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -118,7 +118,7 @@ public class CarePlan extends BaseResource implements IResource { * Path: CarePlan.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -145,7 +145,7 @@ public class CarePlan extends BaseResource implements IResource { * Path: CarePlan.concern
*

*/ - public static final ReferenceParam CONDITION = new ReferenceParam(SP_CONDITION); + public static final ReferenceClientParam CONDITION = new ReferenceClientParam(SP_CONDITION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -172,7 +172,7 @@ public class CarePlan extends BaseResource implements IResource { * Path: CarePlan.period
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for participant @@ -193,7 +193,7 @@ public class CarePlan extends BaseResource implements IResource { * Path: CarePlan.participant.member
*

*/ - public static final ReferenceParam PARTICIPANT = new ReferenceParam(SP_PARTICIPANT); + public static final ReferenceClientParam PARTICIPANT = new ReferenceClientParam(SP_PARTICIPANT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -220,7 +220,7 @@ public class CarePlan extends BaseResource implements IResource { * Path: CarePlan.activity.simple.code
*

*/ - public static final TokenParam ACTIVITYCODE = new TokenParam(SP_ACTIVITYCODE); + public static final TokenClientParam ACTIVITYCODE = new TokenClientParam(SP_ACTIVITYCODE); /** * Search parameter constant for activitydate @@ -241,7 +241,7 @@ public class CarePlan extends BaseResource implements IResource { * Path: CarePlan.activity.simple.timing[x]
*

*/ - public static final DateParam ACTIVITYDATE = new DateParam(SP_ACTIVITYDATE); + public static final DateClientParam ACTIVITYDATE = new DateClientParam(SP_ACTIVITYDATE); /** * Search parameter constant for activitydetail @@ -262,7 +262,7 @@ public class CarePlan extends BaseResource implements IResource { * Path: CarePlan.activity.detail
*

*/ - public static final ReferenceParam ACTIVITYDETAIL = new ReferenceParam(SP_ACTIVITYDETAIL); + public static final ReferenceClientParam ACTIVITYDETAIL = new ReferenceClientParam(SP_ACTIVITYDETAIL); /** * Constant for fluent queries to be used to add include statements. Specifies 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 ba0f0d5c89e..ee0553496b5 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 @@ -63,7 +63,7 @@ import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -108,7 +108,7 @@ public class Claim extends BaseResource implements IResource { * Path: Claim.number
*

*/ - public static final TokenParam NUMBER = new TokenParam(SP_NUMBER); + public static final TokenClientParam NUMBER = new TokenClientParam(SP_NUMBER); @Child(name="number", type=IdentifierDt.class, order=0, min=0, max=1) 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 ebc86369912..443eb3b0d0f 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 @@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -111,7 +111,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for class @@ -132,7 +132,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.class
*

*/ - public static final TokenParam CLASS = new TokenParam(SP_CLASS); + public static final TokenClientParam CLASS = new TokenClientParam(SP_CLASS); /** * Search parameter constant for date @@ -153,7 +153,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for subject @@ -174,7 +174,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -201,7 +201,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.author
*

*/ - public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR); + public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -228,7 +228,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.attester.party
*

*/ - public static final ReferenceParam ATTESTER = new ReferenceParam(SP_ATTESTER); + public static final ReferenceClientParam ATTESTER = new ReferenceClientParam(SP_ATTESTER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -255,7 +255,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.event.code
*

*/ - public static final TokenParam CONTEXT = new TokenParam(SP_CONTEXT); + public static final TokenClientParam CONTEXT = new TokenClientParam(SP_CONTEXT); /** * Search parameter constant for section-type @@ -276,7 +276,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.section.code
*

*/ - public static final TokenParam SECTION_TYPE = new TokenParam(SP_SECTION_TYPE); + public static final TokenClientParam SECTION_TYPE = new TokenClientParam(SP_SECTION_TYPE); /** * Search parameter constant for section-content @@ -297,7 +297,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.section.content
*

*/ - public static final ReferenceParam SECTION_CONTENT = new ReferenceParam(SP_SECTION_CONTENT); + public static final ReferenceClientParam SECTION_CONTENT = new ReferenceClientParam(SP_SECTION_CONTENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -324,7 +324,7 @@ public class Composition extends BaseResource implements IResource { * Path: Composition.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1) 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 03350c286ed..c24e6e6000b 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 @@ -63,10 +63,10 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -111,7 +111,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for version @@ -132,7 +132,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.version
*

*/ - public static final TokenParam VERSION = new TokenParam(SP_VERSION); + public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION); /** * Search parameter constant for name @@ -153,7 +153,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for publisher @@ -174,7 +174,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.publisher
*

*/ - public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER); + public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER); /** * Search parameter constant for description @@ -195,7 +195,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.description
*

*/ - public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION); + public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION); /** * Search parameter constant for status @@ -216,7 +216,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for date @@ -237,7 +237,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for source @@ -258,7 +258,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.source
*

*/ - public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE); + public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -285,7 +285,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.target
*

*/ - public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET); + public static final ReferenceClientParam TARGET = new ReferenceClientParam(SP_TARGET); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -312,7 +312,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.concept.map.system
*

*/ - public static final TokenParam SYSTEM = new TokenParam(SP_SYSTEM); + public static final TokenClientParam SYSTEM = new TokenClientParam(SP_SYSTEM); /** * Search parameter constant for dependson @@ -333,7 +333,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.concept.dependsOn.concept
*

*/ - public static final TokenParam DEPENDSON = new TokenParam(SP_DEPENDSON); + public static final TokenClientParam DEPENDSON = new TokenClientParam(SP_DEPENDSON); /** * Search parameter constant for product @@ -354,7 +354,7 @@ public class ConceptMap extends BaseResource implements IResource { * Path: ConceptMap.concept.map.product.concept
*

*/ - public static final TokenParam PRODUCT = new TokenParam(SP_PRODUCT); + public static final TokenClientParam PRODUCT = new TokenClientParam(SP_PRODUCT); @Child(name="identifier", type=StringDt.class, order=0, min=0, max=1) 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 7479e743386..ac0a20d4669 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 @@ -65,9 +65,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -112,7 +112,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for status @@ -133,7 +133,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for severity @@ -154,7 +154,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.severity
*

*/ - public static final TokenParam SEVERITY = new TokenParam(SP_SEVERITY); + public static final TokenClientParam SEVERITY = new TokenClientParam(SP_SEVERITY); /** * Search parameter constant for category @@ -175,7 +175,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.category
*

*/ - public static final TokenParam CATEGORY = new TokenParam(SP_CATEGORY); + public static final TokenClientParam CATEGORY = new TokenClientParam(SP_CATEGORY); /** * Search parameter constant for onset @@ -196,7 +196,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.onset[x]
*

*/ - public static final DateParam ONSET = new DateParam(SP_ONSET); + public static final DateClientParam ONSET = new DateClientParam(SP_ONSET); /** * Search parameter constant for subject @@ -217,7 +217,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -244,7 +244,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.encounter
*

*/ - public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER); + public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -271,7 +271,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.asserter
*

*/ - public static final ReferenceParam ASSERTER = new ReferenceParam(SP_ASSERTER); + public static final ReferenceClientParam ASSERTER = new ReferenceClientParam(SP_ASSERTER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -298,7 +298,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.dateAsserted
*

*/ - public static final DateParam DATE_ASSERTED = new DateParam(SP_DATE_ASSERTED); + public static final DateClientParam DATE_ASSERTED = new DateClientParam(SP_DATE_ASSERTED); /** * Search parameter constant for evidence @@ -319,7 +319,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.evidence.code
*

*/ - public static final TokenParam EVIDENCE = new TokenParam(SP_EVIDENCE); + public static final TokenClientParam EVIDENCE = new TokenClientParam(SP_EVIDENCE); /** * Search parameter constant for location @@ -340,7 +340,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.location.code
*

*/ - public static final TokenParam LOCATION = new TokenParam(SP_LOCATION); + public static final TokenClientParam LOCATION = new TokenClientParam(SP_LOCATION); /** * Search parameter constant for related-item @@ -361,7 +361,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.relatedItem.target
*

*/ - public static final ReferenceParam RELATED_ITEM = new ReferenceParam(SP_RELATED_ITEM); + public static final ReferenceClientParam RELATED_ITEM = new ReferenceClientParam(SP_RELATED_ITEM); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -388,7 +388,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.stage.summary
*

*/ - public static final TokenParam STAGE = new TokenParam(SP_STAGE); + public static final TokenClientParam STAGE = new TokenClientParam(SP_STAGE); /** * Search parameter constant for related-code @@ -409,7 +409,7 @@ public class Condition extends BaseResource implements IResource { * Path: Condition.relatedItem.code
*

*/ - public static final TokenParam RELATED_CODE = new TokenParam(SP_RELATED_CODE); + public static final TokenClientParam RELATED_CODE = new TokenClientParam(SP_RELATED_CODE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 ce9bdb4c656..b2ef5a97401 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 @@ -77,10 +77,10 @@ import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -125,7 +125,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for version @@ -146,7 +146,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.version
*

*/ - public static final TokenParam VERSION = new TokenParam(SP_VERSION); + public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION); /** * Search parameter constant for name @@ -167,7 +167,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for publisher @@ -188,7 +188,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.publisher
*

*/ - public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER); + public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER); /** * Search parameter constant for description @@ -209,7 +209,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.description
*

*/ - public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION); + public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION); /** * Search parameter constant for status @@ -230,7 +230,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for date @@ -251,7 +251,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for software @@ -272,7 +272,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.software.name
*

*/ - public static final StringParam SOFTWARE = new StringParam(SP_SOFTWARE); + public static final StringClientParam SOFTWARE = new StringClientParam(SP_SOFTWARE); /** * Search parameter constant for fhirversion @@ -293,7 +293,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.version
*

*/ - public static final TokenParam FHIRVERSION = new TokenParam(SP_FHIRVERSION); + public static final TokenClientParam FHIRVERSION = new TokenClientParam(SP_FHIRVERSION); /** * Search parameter constant for resource @@ -314,7 +314,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.rest.resource.type
*

*/ - public static final TokenParam RESOURCE = new TokenParam(SP_RESOURCE); + public static final TokenClientParam RESOURCE = new TokenClientParam(SP_RESOURCE); /** * Search parameter constant for event @@ -335,7 +335,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.messaging.event.code
*

*/ - public static final TokenParam EVENT = new TokenParam(SP_EVENT); + public static final TokenClientParam EVENT = new TokenClientParam(SP_EVENT); /** * Search parameter constant for mode @@ -356,7 +356,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.rest.mode
*

*/ - public static final TokenParam MODE = new TokenParam(SP_MODE); + public static final TokenClientParam MODE = new TokenClientParam(SP_MODE); /** * Search parameter constant for profile @@ -377,7 +377,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.rest.resource.profile
*

*/ - public static final ReferenceParam PROFILE = new ReferenceParam(SP_PROFILE); + public static final ReferenceClientParam PROFILE = new ReferenceClientParam(SP_PROFILE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -404,7 +404,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.format
*

*/ - public static final TokenParam FORMAT = new TokenParam(SP_FORMAT); + public static final TokenClientParam FORMAT = new TokenClientParam(SP_FORMAT); /** * Search parameter constant for security @@ -425,7 +425,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.rest.security
*

*/ - public static final TokenParam SECURITY = new TokenParam(SP_SECURITY); + public static final TokenClientParam SECURITY = new TokenClientParam(SP_SECURITY); /** * Search parameter constant for supported-profile @@ -446,7 +446,7 @@ public class Conformance extends BaseResource implements IResource { * Path: Conformance.profile
*

*/ - public static final ReferenceParam SUPPORTED_PROFILE = new ReferenceParam(SP_SUPPORTED_PROFILE); + public static final ReferenceClientParam SUPPORTED_PROFILE = new ReferenceClientParam(SP_SUPPORTED_PROFILE); /** * Constant for fluent queries to be used to add include statements. Specifies 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 c6c5dd063c2..a2c4cc072c7 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 @@ -61,8 +61,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -107,7 +107,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.issuer
*

*/ - public static final ReferenceParam ISSUER = new ReferenceParam(SP_ISSUER); + public static final ReferenceClientParam ISSUER = new ReferenceClientParam(SP_ISSUER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -134,7 +134,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for type @@ -155,7 +155,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for plan @@ -176,7 +176,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.plan
*

*/ - public static final TokenParam PLAN = new TokenParam(SP_PLAN); + public static final TokenClientParam PLAN = new TokenClientParam(SP_PLAN); /** * Search parameter constant for subplan @@ -197,7 +197,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.subplan
*

*/ - public static final TokenParam SUBPLAN = new TokenParam(SP_SUBPLAN); + public static final TokenClientParam SUBPLAN = new TokenClientParam(SP_SUBPLAN); /** * Search parameter constant for group @@ -218,7 +218,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.group
*

*/ - public static final TokenParam GROUP = new TokenParam(SP_GROUP); + public static final TokenClientParam GROUP = new TokenClientParam(SP_GROUP); /** * Search parameter constant for dependent @@ -239,7 +239,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.dependent
*

*/ - public static final TokenParam DEPENDENT = new TokenParam(SP_DEPENDENT); + public static final TokenClientParam DEPENDENT = new TokenClientParam(SP_DEPENDENT); /** * Search parameter constant for sequence @@ -260,7 +260,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.sequence
*

*/ - public static final TokenParam SEQUENCE = new TokenParam(SP_SEQUENCE); + public static final TokenClientParam SEQUENCE = new TokenClientParam(SP_SEQUENCE); /** * Search parameter constant for name @@ -281,7 +281,7 @@ public class Coverage extends BaseResource implements IResource { * Path: Coverage.subscriber.name
*

*/ - public static final TokenParam NAME = new TokenParam(SP_NAME); + public static final TokenClientParam NAME = new TokenClientParam(SP_NAME); @Child(name="issuer", order=0, min=0, max=1, type={ 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 770c9e9009a..df288b161b3 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 @@ -58,9 +58,9 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -105,7 +105,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for manufacturer @@ -126,7 +126,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.manufacturer
*

*/ - public static final StringParam MANUFACTURER = new StringParam(SP_MANUFACTURER); + public static final StringClientParam MANUFACTURER = new StringClientParam(SP_MANUFACTURER); /** * Search parameter constant for model @@ -147,7 +147,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.model
*

*/ - public static final StringParam MODEL = new StringParam(SP_MODEL); + public static final StringClientParam MODEL = new StringClientParam(SP_MODEL); /** * Search parameter constant for organization @@ -168,7 +168,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.owner
*

*/ - public static final ReferenceParam ORGANIZATION = new ReferenceParam(SP_ORGANIZATION); + public static final ReferenceClientParam ORGANIZATION = new ReferenceClientParam(SP_ORGANIZATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -195,7 +195,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for location @@ -216,7 +216,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.location
*

*/ - public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION); + public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -243,7 +243,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -270,7 +270,7 @@ public class Device extends BaseResource implements IResource { * Path: Device.udi
*

*/ - public static final StringParam UDI = new StringParam(SP_UDI); + public static final StringClientParam UDI = new StringClientParam(SP_UDI); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 5b42ae0408a..06ceebc26d1 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 @@ -57,8 +57,8 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -103,7 +103,7 @@ public class DeviceObservationReport extends BaseResource implements IResource { * Path: DeviceObservationReport.source
*

*/ - public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE); + public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -130,7 +130,7 @@ public class DeviceObservationReport extends BaseResource implements IResource { * Path: DeviceObservationReport.virtualDevice.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for channel @@ -151,7 +151,7 @@ public class DeviceObservationReport extends BaseResource implements IResource { * Path: DeviceObservationReport.virtualDevice.channel.code
*

*/ - public static final TokenParam CHANNEL = new TokenParam(SP_CHANNEL); + public static final TokenClientParam CHANNEL = new TokenClientParam(SP_CHANNEL); /** * Search parameter constant for observation @@ -172,7 +172,7 @@ public class DeviceObservationReport extends BaseResource implements IResource { * Path: DeviceObservationReport.virtualDevice.channel.metric.observation
*

*/ - public static final ReferenceParam OBSERVATION = new ReferenceParam(SP_OBSERVATION); + public static final ReferenceClientParam OBSERVATION = new ReferenceClientParam(SP_OBSERVATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -199,7 +199,7 @@ public class DeviceObservationReport extends BaseResource implements IResource { * Path: DeviceObservationReport.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 94f04c764d4..b96077d47d0 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 @@ -62,10 +62,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.CompositeParam; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -110,7 +110,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.event.actor | DiagnosticOrder.item.event.actor
*

*/ - public static final ReferenceParam ACTOR = new ReferenceParam(SP_ACTOR); + public static final ReferenceClientParam ACTOR = new ReferenceClientParam(SP_ACTOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -143,7 +143,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.item.bodySite
*

*/ - public static final TokenParam BODYSITE = new TokenParam(SP_BODYSITE); + public static final TokenClientParam BODYSITE = new TokenClientParam(SP_BODYSITE); /** * Search parameter constant for code @@ -164,7 +164,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.item.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for event-date @@ -185,7 +185,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.event.dateTime
*

*/ - public static final DateParam EVENT_DATE = new DateParam(SP_EVENT_DATE); + public static final DateClientParam EVENT_DATE = new DateClientParam(SP_EVENT_DATE); /** * Search parameter constant for encounter @@ -206,7 +206,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.encounter
*

*/ - public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER); + public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -233,7 +233,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for item-date @@ -254,7 +254,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.item.event.dateTime
*

*/ - public static final DateParam ITEM_DATE = new DateParam(SP_ITEM_DATE); + public static final DateClientParam ITEM_DATE = new DateClientParam(SP_ITEM_DATE); /** * Search parameter constant for item-past-status @@ -275,7 +275,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.item.event.status
*

*/ - public static final TokenParam ITEM_PAST_STATUS = new TokenParam(SP_ITEM_PAST_STATUS); + public static final TokenClientParam ITEM_PAST_STATUS = new TokenClientParam(SP_ITEM_PAST_STATUS); /** * Search parameter constant for item-status @@ -296,7 +296,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.item.status
*

*/ - public static final TokenParam ITEM_STATUS = new TokenParam(SP_ITEM_STATUS); + public static final TokenClientParam ITEM_STATUS = new TokenClientParam(SP_ITEM_STATUS); /** * Search parameter constant for item-status-date @@ -317,7 +317,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: item-past-status & item-date
*

*/ - public static final CompositeParam ITEM_STATUS_DATE = new CompositeParam(SP_ITEM_STATUS_DATE); + public static final CompositeClientParam ITEM_STATUS_DATE = new CompositeClientParam(SP_ITEM_STATUS_DATE); /** * Search parameter constant for orderer @@ -338,7 +338,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.orderer
*

*/ - public static final ReferenceParam ORDERER = new ReferenceParam(SP_ORDERER); + public static final ReferenceClientParam ORDERER = new ReferenceClientParam(SP_ORDERER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -365,7 +365,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.event.status
*

*/ - public static final TokenParam EVENT_STATUS = new TokenParam(SP_EVENT_STATUS); + public static final TokenClientParam EVENT_STATUS = new TokenClientParam(SP_EVENT_STATUS); /** * Search parameter constant for specimen @@ -386,7 +386,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.specimen | DiagnosticOrder.item.specimen
*

*/ - public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN); + public static final ReferenceClientParam SPECIMEN = new ReferenceClientParam(SP_SPECIMEN); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -419,7 +419,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for event-status-date @@ -440,7 +440,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: event-status & event-date
*

*/ - public static final CompositeParam EVENT_STATUS_DATE = new CompositeParam(SP_EVENT_STATUS_DATE); + public static final CompositeClientParam EVENT_STATUS_DATE = new CompositeClientParam(SP_EVENT_STATUS_DATE); /** * Search parameter constant for subject @@ -461,7 +461,7 @@ public class DiagnosticOrder extends BaseResource implements IResource { * Path: DiagnosticOrder.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 d709c8f2852..075a9ad86ed 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 @@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -111,7 +111,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for issued @@ -132,7 +132,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.issued
*

*/ - public static final DateParam ISSUED = new DateParam(SP_ISSUED); + public static final DateClientParam ISSUED = new DateClientParam(SP_ISSUED); /** * Search parameter constant for subject @@ -153,7 +153,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -180,7 +180,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.performer
*

*/ - public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER); + public static final ReferenceClientParam PERFORMER = new ReferenceClientParam(SP_PERFORMER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -207,7 +207,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for service @@ -228,7 +228,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.serviceCategory
*

*/ - public static final TokenParam SERVICE = new TokenParam(SP_SERVICE); + public static final TokenClientParam SERVICE = new TokenClientParam(SP_SERVICE); /** * Search parameter constant for date @@ -249,7 +249,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.diagnostic[x]
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for specimen @@ -270,7 +270,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.specimen
*

*/ - public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN); + public static final ReferenceClientParam SPECIMEN = new ReferenceClientParam(SP_SPECIMEN); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -297,7 +297,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.name
*

*/ - public static final TokenParam NAME = new TokenParam(SP_NAME); + public static final TokenClientParam NAME = new TokenClientParam(SP_NAME); /** * Search parameter constant for result @@ -318,7 +318,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.result
*

*/ - public static final ReferenceParam RESULT = new ReferenceParam(SP_RESULT); + public static final ReferenceClientParam RESULT = new ReferenceClientParam(SP_RESULT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -345,7 +345,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.codedDiagnosis
*

*/ - public static final TokenParam DIAGNOSIS = new TokenParam(SP_DIAGNOSIS); + public static final TokenClientParam DIAGNOSIS = new TokenClientParam(SP_DIAGNOSIS); /** * Search parameter constant for image @@ -366,7 +366,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.image.link
*

*/ - public static final ReferenceParam IMAGE = new ReferenceParam(SP_IMAGE); + public static final ReferenceClientParam IMAGE = new ReferenceClientParam(SP_IMAGE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -393,7 +393,7 @@ public class DiagnosticReport extends BaseResource implements IResource { * Path: DiagnosticReport.requestDetail
*

*/ - public static final ReferenceParam REQUEST = new ReferenceParam(SP_REQUEST); + public static final ReferenceClientParam REQUEST = new ReferenceClientParam(SP_REQUEST); /** * Constant for fluent queries to be used to add include statements. Specifies 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 e7da7a67521..72f97970d13 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 @@ -59,10 +59,10 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -107,7 +107,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.masterIdentifier | DocumentManifest.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for subject @@ -128,7 +128,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -155,7 +155,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for recipient @@ -176,7 +176,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.recipient
*

*/ - public static final ReferenceParam RECIPIENT = new ReferenceParam(SP_RECIPIENT); + public static final ReferenceClientParam RECIPIENT = new ReferenceClientParam(SP_RECIPIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -203,7 +203,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.author
*

*/ - public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR); + public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -230,7 +230,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.created
*

*/ - public static final DateParam CREATED = new DateParam(SP_CREATED); + public static final DateClientParam CREATED = new DateClientParam(SP_CREATED); /** * Search parameter constant for status @@ -251,7 +251,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for supersedes @@ -272,7 +272,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.supercedes
*

*/ - public static final ReferenceParam SUPERSEDES = new ReferenceParam(SP_SUPERSEDES); + public static final ReferenceClientParam SUPERSEDES = new ReferenceClientParam(SP_SUPERSEDES); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -299,7 +299,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.description
*

*/ - public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION); + public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION); /** * Search parameter constant for confidentiality @@ -320,7 +320,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.confidentiality
*

*/ - public static final TokenParam CONFIDENTIALITY = new TokenParam(SP_CONFIDENTIALITY); + public static final TokenClientParam CONFIDENTIALITY = new TokenClientParam(SP_CONFIDENTIALITY); /** * Search parameter constant for content @@ -341,7 +341,7 @@ public class DocumentManifest extends BaseResource implements IResource { * Path: DocumentManifest.content
*

*/ - public static final ReferenceParam CONTENT = new ReferenceParam(SP_CONTENT); + public static final ReferenceClientParam CONTENT = new ReferenceClientParam(SP_CONTENT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 de1c3b77d0b..3a0fecb6bd9 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 @@ -66,12 +66,12 @@ import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.CompositeParam; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.NumberParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -116,7 +116,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.masterIdentifier | DocumentReference.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for subject @@ -137,7 +137,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -164,7 +164,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for class @@ -185,7 +185,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.class
*

*/ - public static final TokenParam CLASS = new TokenParam(SP_CLASS); + public static final TokenClientParam CLASS = new TokenClientParam(SP_CLASS); /** * Search parameter constant for author @@ -206,7 +206,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.author
*

*/ - public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR); + public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -233,7 +233,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.custodian
*

*/ - public static final ReferenceParam CUSTODIAN = new ReferenceParam(SP_CUSTODIAN); + public static final ReferenceClientParam CUSTODIAN = new ReferenceClientParam(SP_CUSTODIAN); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -260,7 +260,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.authenticator
*

*/ - public static final ReferenceParam AUTHENTICATOR = new ReferenceParam(SP_AUTHENTICATOR); + public static final ReferenceClientParam AUTHENTICATOR = new ReferenceClientParam(SP_AUTHENTICATOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -287,7 +287,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.created
*

*/ - public static final DateParam CREATED = new DateParam(SP_CREATED); + public static final DateClientParam CREATED = new DateClientParam(SP_CREATED); /** * Search parameter constant for indexed @@ -308,7 +308,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.indexed
*

*/ - public static final DateParam INDEXED = new DateParam(SP_INDEXED); + public static final DateClientParam INDEXED = new DateClientParam(SP_INDEXED); /** * Search parameter constant for status @@ -329,7 +329,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for relatesto @@ -350,7 +350,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.relatesTo.target
*

*/ - public static final ReferenceParam RELATESTO = new ReferenceParam(SP_RELATESTO); + public static final ReferenceClientParam RELATESTO = new ReferenceClientParam(SP_RELATESTO); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -377,7 +377,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.relatesTo.code
*

*/ - public static final TokenParam RELATION = new TokenParam(SP_RELATION); + public static final TokenClientParam RELATION = new TokenClientParam(SP_RELATION); /** * Search parameter constant for relationship @@ -398,7 +398,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: relatesto & relation
*

*/ - public static final CompositeParam RELATIONSHIP = new CompositeParam(SP_RELATIONSHIP); + public static final CompositeClientParam RELATIONSHIP = new CompositeClientParam(SP_RELATIONSHIP); /** * Search parameter constant for description @@ -419,7 +419,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.description
*

*/ - public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION); + public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION); /** * Search parameter constant for confidentiality @@ -440,7 +440,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.confidentiality
*

*/ - public static final TokenParam CONFIDENTIALITY = new TokenParam(SP_CONFIDENTIALITY); + public static final TokenClientParam CONFIDENTIALITY = new TokenClientParam(SP_CONFIDENTIALITY); /** * Search parameter constant for language @@ -461,7 +461,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.primaryLanguage
*

*/ - public static final TokenParam LANGUAGE = new TokenParam(SP_LANGUAGE); + public static final TokenClientParam LANGUAGE = new TokenClientParam(SP_LANGUAGE); /** * Search parameter constant for format @@ -482,7 +482,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.format
*

*/ - public static final TokenParam FORMAT = new TokenParam(SP_FORMAT); + public static final TokenClientParam FORMAT = new TokenClientParam(SP_FORMAT); /** * Search parameter constant for size @@ -503,7 +503,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.size
*

*/ - public static final NumberParam SIZE = new NumberParam(SP_SIZE); + public static final NumberClientParam SIZE = new NumberClientParam(SP_SIZE); /** * Search parameter constant for location @@ -524,7 +524,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.location
*

*/ - public static final StringParam LOCATION = new StringParam(SP_LOCATION); + public static final StringClientParam LOCATION = new StringClientParam(SP_LOCATION); /** * Search parameter constant for event @@ -545,7 +545,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.context.event
*

*/ - public static final TokenParam EVENT = new TokenParam(SP_EVENT); + public static final TokenClientParam EVENT = new TokenClientParam(SP_EVENT); /** * Search parameter constant for period @@ -566,7 +566,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.context.period
*

*/ - public static final DateParam PERIOD = new DateParam(SP_PERIOD); + public static final DateClientParam PERIOD = new DateClientParam(SP_PERIOD); /** * Search parameter constant for facility @@ -587,7 +587,7 @@ public class DocumentReference extends BaseResource implements IResource { * Path: DocumentReference.context.facilityType
*

*/ - public static final TokenParam FACILITY = new TokenParam(SP_FACILITY); + public static final TokenClientParam FACILITY = new TokenClientParam(SP_FACILITY); @Child(name="masterIdentifier", type=IdentifierDt.class, order=0, min=1, max=1) 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 3ac4f72f015..2c8b12cff36 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 @@ -66,10 +66,10 @@ import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.NumberParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -114,7 +114,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for status @@ -135,7 +135,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for date @@ -156,7 +156,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.period
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for subject @@ -177,7 +177,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -204,7 +204,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.length
*

*/ - public static final NumberParam LENGTH = new NumberParam(SP_LENGTH); + public static final NumberClientParam LENGTH = new NumberClientParam(SP_LENGTH); /** * Search parameter constant for indication @@ -225,7 +225,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.indication
*

*/ - public static final ReferenceParam INDICATION = new ReferenceParam(SP_INDICATION); + public static final ReferenceClientParam INDICATION = new ReferenceClientParam(SP_INDICATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -252,7 +252,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.location.location
*

*/ - public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION); + public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -279,7 +279,7 @@ public class Encounter extends BaseResource implements IResource { * Path: Encounter.location.period
*

*/ - public static final DateParam LOCATION_PERIOD = new DateParam(SP_LOCATION_PERIOD); + public static final DateClientParam LOCATION_PERIOD = new DateClientParam(SP_LOCATION_PERIOD); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 068024376b6..9b496d1c3d4 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 @@ -61,7 +61,7 @@ import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -106,7 +106,7 @@ public class FamilyHistory extends BaseResource implements IResource { * Path: FamilyHistory.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 21ea7214607..6ad0172b2dc 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 @@ -59,8 +59,8 @@ import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -105,7 +105,7 @@ public class GVFMeta extends BaseResource implements IResource { * Path: GVFMeta.subject.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -132,7 +132,7 @@ public class GVFMeta extends BaseResource implements IResource { * Path: GVFMeta.sourceFile
*

*/ - public static final StringParam FILE = new StringParam(SP_FILE); + public static final StringClientParam FILE = new StringClientParam(SP_FILE); @Child(name="subject", order=0, min=0, max=Child.MAX_UNLIMITED) 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 5633e6a130c..13ab77fe41c 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 @@ -56,8 +56,8 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -102,7 +102,7 @@ public class GVFVariant extends BaseResource implements IResource { * Path: GVFVariant.subject.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -129,7 +129,7 @@ public class GVFVariant extends BaseResource implements IResource { * Path:
*

*/ - public static final StringParam COORDINATE = new StringParam(SP_COORDINATE); + public static final StringClientParam COORDINATE = new StringClientParam(SP_COORDINATE); @Child(name="subject", order=0, min=0, max=1) 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 ae357ac37a7..02855f12872 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 @@ -54,8 +54,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -100,7 +100,7 @@ public class GeneExpression extends BaseResource implements IResource { * Path: GeneExpression.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -127,7 +127,7 @@ public class GeneExpression extends BaseResource implements IResource { * Path: GeneExpression.gene.identifier
*

*/ - public static final StringParam GENE = new StringParam(SP_GENE); + public static final StringClientParam GENE = new StringClientParam(SP_GENE); /** * Search parameter constant for coordinate @@ -148,7 +148,7 @@ public class GeneExpression extends BaseResource implements IResource { * Path: GeneExpression.gene.coordinate
*

*/ - public static final StringParam COORDINATE = new StringParam(SP_COORDINATE); + public static final StringClientParam COORDINATE = new StringClientParam(SP_COORDINATE); @Child(name="subject", order=0, min=0, max=1, type={ 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 9b9d77b121d..1d58e9e4fe0 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 @@ -57,8 +57,8 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -103,7 +103,7 @@ public class GeneticAnalysis extends BaseResource implements IResource { * Path: GeneticAnalysis.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -130,7 +130,7 @@ public class GeneticAnalysis extends BaseResource implements IResource { * Path: GeneticAnalysis.author
*

*/ - public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR); + public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -157,7 +157,7 @@ public class GeneticAnalysis extends BaseResource implements IResource { * Path: GeneticAnalysis.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); @Child(name="subject", order=0, min=0, max=1, type={ 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 7c4816c384b..ed73445ae83 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 @@ -63,9 +63,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.CompositeParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -110,7 +110,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for code @@ -131,7 +131,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for actual @@ -152,7 +152,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.actual
*

*/ - public static final TokenParam ACTUAL = new TokenParam(SP_ACTUAL); + public static final TokenClientParam ACTUAL = new TokenClientParam(SP_ACTUAL); /** * Search parameter constant for identifier @@ -173,7 +173,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for member @@ -194,7 +194,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.member
*

*/ - public static final ReferenceParam MEMBER = new ReferenceParam(SP_MEMBER); + public static final ReferenceClientParam MEMBER = new ReferenceClientParam(SP_MEMBER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -221,7 +221,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.characteristic.code
*

*/ - public static final TokenParam CHARACTERISTIC = new TokenParam(SP_CHARACTERISTIC); + public static final TokenClientParam CHARACTERISTIC = new TokenClientParam(SP_CHARACTERISTIC); /** * Search parameter constant for value @@ -242,7 +242,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.characteristic.value[x]
*

*/ - public static final TokenParam VALUE = new TokenParam(SP_VALUE); + public static final TokenClientParam VALUE = new TokenClientParam(SP_VALUE); /** * Search parameter constant for exclude @@ -263,7 +263,7 @@ public class Group extends BaseResource implements IResource { * Path: Group.characteristic.exclude
*

*/ - public static final TokenParam EXCLUDE = new TokenParam(SP_EXCLUDE); + public static final TokenClientParam EXCLUDE = new TokenClientParam(SP_EXCLUDE); /** * Search parameter constant for characteristic-value @@ -284,7 +284,7 @@ public class Group extends BaseResource implements IResource { * Path: characteristic & value
*

*/ - public static final CompositeParam CHARACTERISTIC_VALUE = new CompositeParam(SP_CHARACTERISTIC_VALUE); + public static final CompositeClientParam CHARACTERISTIC_VALUE = new CompositeClientParam(SP_CHARACTERISTIC_VALUE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1) 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 dcdb2bbd2cf..a1e600fc55c 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 @@ -66,10 +66,10 @@ import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.NumberParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -114,7 +114,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -141,7 +141,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.dateTime
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for accession @@ -162,7 +162,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.accessionNo
*

*/ - public static final TokenParam ACCESSION = new TokenParam(SP_ACCESSION); + public static final TokenClientParam ACCESSION = new TokenClientParam(SP_ACCESSION); /** * Search parameter constant for study @@ -183,7 +183,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.uid
*

*/ - public static final TokenParam STUDY = new TokenParam(SP_STUDY); + public static final TokenClientParam STUDY = new TokenClientParam(SP_STUDY); /** * Search parameter constant for series @@ -204,7 +204,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.series.uid
*

*/ - public static final TokenParam SERIES = new TokenParam(SP_SERIES); + public static final TokenClientParam SERIES = new TokenClientParam(SP_SERIES); /** * Search parameter constant for modality @@ -225,7 +225,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.series.modality
*

*/ - public static final TokenParam MODALITY = new TokenParam(SP_MODALITY); + public static final TokenClientParam MODALITY = new TokenClientParam(SP_MODALITY); /** * Search parameter constant for size @@ -246,7 +246,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path:
*

*/ - public static final NumberParam SIZE = new NumberParam(SP_SIZE); + public static final NumberClientParam SIZE = new NumberClientParam(SP_SIZE); /** * Search parameter constant for bodysite @@ -267,7 +267,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.series.bodySite
*

*/ - public static final TokenParam BODYSITE = new TokenParam(SP_BODYSITE); + public static final TokenClientParam BODYSITE = new TokenClientParam(SP_BODYSITE); /** * Search parameter constant for uid @@ -288,7 +288,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.series.instance.uid
*

*/ - public static final TokenParam UID = new TokenParam(SP_UID); + public static final TokenClientParam UID = new TokenClientParam(SP_UID); /** * Search parameter constant for dicom-class @@ -309,7 +309,7 @@ public class ImagingStudy extends BaseResource implements IResource { * Path: ImagingStudy.series.instance.sopclass
*

*/ - public static final TokenParam DICOM_CLASS = new TokenParam(SP_DICOM_CLASS); + public static final TokenClientParam DICOM_CLASS = new TokenClientParam(SP_DICOM_CLASS); @Child(name="dateTime", type=DateTimeDt.class, order=0, min=0, max=1) 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 fa2407dbd01..6da2489e547 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 @@ -66,11 +66,11 @@ import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.NumberParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -115,7 +115,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for dose-sequence @@ -136,7 +136,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.vaccinationProtocol.doseSequence
*

*/ - public static final NumberParam DOSE_SEQUENCE = new NumberParam(SP_DOSE_SEQUENCE); + public static final NumberClientParam DOSE_SEQUENCE = new NumberClientParam(SP_DOSE_SEQUENCE); /** * Search parameter constant for identifier @@ -157,7 +157,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for location @@ -178,7 +178,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.location
*

*/ - public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION); + public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -205,7 +205,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.lotNumber
*

*/ - public static final StringParam LOT_NUMBER = new StringParam(SP_LOT_NUMBER); + public static final StringClientParam LOT_NUMBER = new StringClientParam(SP_LOT_NUMBER); /** * Search parameter constant for manufacturer @@ -226,7 +226,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.manufacturer
*

*/ - public static final ReferenceParam MANUFACTURER = new ReferenceParam(SP_MANUFACTURER); + public static final ReferenceClientParam MANUFACTURER = new ReferenceClientParam(SP_MANUFACTURER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -253,7 +253,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.performer
*

*/ - public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER); + public static final ReferenceClientParam PERFORMER = new ReferenceClientParam(SP_PERFORMER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -280,7 +280,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.reaction.detail
*

*/ - public static final ReferenceParam REACTION = new ReferenceParam(SP_REACTION); + public static final ReferenceClientParam REACTION = new ReferenceClientParam(SP_REACTION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -307,7 +307,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.reaction.date
*

*/ - public static final DateParam REACTION_DATE = new DateParam(SP_REACTION_DATE); + public static final DateClientParam REACTION_DATE = new DateClientParam(SP_REACTION_DATE); /** * Search parameter constant for reason @@ -328,7 +328,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.explanation.reason
*

*/ - public static final TokenParam REASON = new TokenParam(SP_REASON); + public static final TokenClientParam REASON = new TokenClientParam(SP_REASON); /** * Search parameter constant for refusal-reason @@ -349,7 +349,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.explanation.refusalReason
*

*/ - public static final TokenParam REFUSAL_REASON = new TokenParam(SP_REFUSAL_REASON); + public static final TokenClientParam REFUSAL_REASON = new TokenClientParam(SP_REFUSAL_REASON); /** * Search parameter constant for refused @@ -370,7 +370,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.refusedIndicator
*

*/ - public static final TokenParam REFUSED = new TokenParam(SP_REFUSED); + public static final TokenClientParam REFUSED = new TokenClientParam(SP_REFUSED); /** * Search parameter constant for requester @@ -391,7 +391,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.requester
*

*/ - public static final ReferenceParam REQUESTER = new ReferenceParam(SP_REQUESTER); + public static final ReferenceClientParam REQUESTER = new ReferenceClientParam(SP_REQUESTER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -418,7 +418,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -445,7 +445,7 @@ public class Immunization extends BaseResource implements IResource { * Path: Immunization.vaccineType
*

*/ - public static final TokenParam VACCINE_TYPE = new TokenParam(SP_VACCINE_TYPE); + public static final TokenClientParam VACCINE_TYPE = new TokenClientParam(SP_VACCINE_TYPE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 1a6a5ffe085..2e92175318a 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 @@ -62,10 +62,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.NumberParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -110,7 +110,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -137,7 +137,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.recommendation.vaccineType
*

*/ - public static final TokenParam VACCINE_TYPE = new TokenParam(SP_VACCINE_TYPE); + public static final TokenClientParam VACCINE_TYPE = new TokenClientParam(SP_VACCINE_TYPE); /** * Search parameter constant for identifier @@ -158,7 +158,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for date @@ -179,7 +179,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.recommendation.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for dose-number @@ -200,7 +200,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.recommendation.doseNumber
*

*/ - public static final NumberParam DOSE_NUMBER = new NumberParam(SP_DOSE_NUMBER); + public static final NumberClientParam DOSE_NUMBER = new NumberClientParam(SP_DOSE_NUMBER); /** * Search parameter constant for status @@ -221,7 +221,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.recommendation.forecastStatus
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for dose-sequence @@ -242,7 +242,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.recommendation.protocol.doseSequence
*

*/ - public static final TokenParam DOSE_SEQUENCE = new TokenParam(SP_DOSE_SEQUENCE); + public static final TokenClientParam DOSE_SEQUENCE = new TokenClientParam(SP_DOSE_SEQUENCE); /** * Search parameter constant for support @@ -263,7 +263,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.recommendation.supportingImmunization
*

*/ - public static final ReferenceParam SUPPORT = new ReferenceParam(SP_SUPPORT); + public static final ReferenceClientParam SUPPORT = new ReferenceClientParam(SP_SUPPORT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -290,7 +290,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc * Path: ImmunizationRecommendation.recommendation.supportingPatientInformation
*

*/ - public static final ReferenceParam INFORMATION = new ReferenceParam(SP_INFORMATION); + public static final ReferenceClientParam INFORMATION = new ReferenceClientParam(SP_INFORMATION); /** * Constant for fluent queries to be used to add include statements. Specifies 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 d420210bd4f..fac103724da 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 @@ -61,9 +61,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -108,7 +108,7 @@ public class ListResource extends BaseResource implements IResource { * Path: List.source
*

*/ - public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE); + public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -135,7 +135,7 @@ public class ListResource extends BaseResource implements IResource { * Path: List.entry.item
*

*/ - public static final ReferenceParam ITEM = new ReferenceParam(SP_ITEM); + public static final ReferenceClientParam ITEM = new ReferenceClientParam(SP_ITEM); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -162,7 +162,7 @@ public class ListResource extends BaseResource implements IResource { * Path: List.emptyReason
*

*/ - public static final TokenParam EMPTY_REASON = new TokenParam(SP_EMPTY_REASON); + public static final TokenClientParam EMPTY_REASON = new TokenClientParam(SP_EMPTY_REASON); /** * Search parameter constant for date @@ -183,7 +183,7 @@ public class ListResource extends BaseResource implements IResource { * Path: List.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for code @@ -204,7 +204,7 @@ public class ListResource extends BaseResource implements IResource { * Path: List.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for subject @@ -225,7 +225,7 @@ public class ListResource extends BaseResource implements IResource { * Path: List.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 12e79f8698d..2ce93354396 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 @@ -65,9 +65,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -112,7 +112,7 @@ public class Location extends BaseResource implements IResource { * Path: Location.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for name @@ -133,7 +133,7 @@ public class Location extends BaseResource implements IResource { * Path: Location.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for type @@ -154,7 +154,7 @@ public class Location extends BaseResource implements IResource { * Path: Location.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for address @@ -175,7 +175,7 @@ public class Location extends BaseResource implements IResource { * Path: Location.address
*

*/ - public static final StringParam ADDRESS = new StringParam(SP_ADDRESS); + public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS); /** * Search parameter constant for status @@ -196,7 +196,7 @@ public class Location extends BaseResource implements IResource { * Path: Location.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for partof @@ -217,7 +217,7 @@ public class Location extends BaseResource implements IResource { * Path: Location.partOf
*

*/ - public static final ReferenceParam PARTOF = new ReferenceParam(SP_PARTOF); + public static final ReferenceClientParam PARTOF = new ReferenceClientParam(SP_PARTOF); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -244,7 +244,7 @@ public class Location extends BaseResource implements IResource { * Path:
*

*/ - public static final TokenParam NEAR = new TokenParam(SP_NEAR); + public static final TokenClientParam NEAR = new TokenClientParam(SP_NEAR); /** * Search parameter constant for near-distance @@ -265,7 +265,7 @@ public class Location extends BaseResource implements IResource { * Path:
*

*/ - public static final TokenParam NEAR_DISTANCE = new TokenParam(SP_NEAR_DISTANCE); + public static final TokenClientParam NEAR_DISTANCE = new TokenClientParam(SP_NEAR_DISTANCE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1) 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 4b26d87a382..e45450bbea8 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 @@ -60,9 +60,9 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -107,7 +107,7 @@ public class Media extends BaseResource implements IResource { * Path: Media.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for subtype @@ -128,7 +128,7 @@ public class Media extends BaseResource implements IResource { * Path: Media.subtype
*

*/ - public static final TokenParam SUBTYPE = new TokenParam(SP_SUBTYPE); + public static final TokenClientParam SUBTYPE = new TokenClientParam(SP_SUBTYPE); /** * Search parameter constant for identifier @@ -149,7 +149,7 @@ public class Media extends BaseResource implements IResource { * Path: Media.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for date @@ -170,7 +170,7 @@ public class Media extends BaseResource implements IResource { * Path: Media.dateTime
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for subject @@ -191,7 +191,7 @@ public class Media extends BaseResource implements IResource { * Path: Media.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -218,7 +218,7 @@ public class Media extends BaseResource implements IResource { * Path: Media.operator
*

*/ - public static final ReferenceParam OPERATOR = new ReferenceParam(SP_OPERATOR); + public static final ReferenceClientParam OPERATOR = new ReferenceClientParam(SP_OPERATOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -245,7 +245,7 @@ public class Media extends BaseResource implements IResource { * Path: Media.view
*

*/ - public static final TokenParam VIEW = new TokenParam(SP_VIEW); + public static final TokenClientParam VIEW = new TokenClientParam(SP_VIEW); @Child(name="type", type=CodeDt.class, order=0, min=1, max=1) 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 da4afd349e5..666292c114d 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 @@ -58,9 +58,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -105,7 +105,7 @@ public class Medication extends BaseResource implements IResource { * Path: Medication.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for name @@ -126,7 +126,7 @@ public class Medication extends BaseResource implements IResource { * Path: Medication.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for manufacturer @@ -147,7 +147,7 @@ public class Medication extends BaseResource implements IResource { * Path: Medication.manufacturer
*

*/ - public static final ReferenceParam MANUFACTURER = new ReferenceParam(SP_MANUFACTURER); + public static final ReferenceClientParam MANUFACTURER = new ReferenceClientParam(SP_MANUFACTURER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -174,7 +174,7 @@ public class Medication extends BaseResource implements IResource { * Path: Medication.product.form
*

*/ - public static final TokenParam FORM = new TokenParam(SP_FORM); + public static final TokenClientParam FORM = new TokenClientParam(SP_FORM); /** * Search parameter constant for ingredient @@ -195,7 +195,7 @@ public class Medication extends BaseResource implements IResource { * Path: Medication.product.ingredient.item
*

*/ - public static final ReferenceParam INGREDIENT = new ReferenceParam(SP_INGREDIENT); + public static final ReferenceClientParam INGREDIENT = new ReferenceClientParam(SP_INGREDIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -222,7 +222,7 @@ public class Medication extends BaseResource implements IResource { * Path: Medication.package.container
*

*/ - public static final TokenParam CONTAINER = new TokenParam(SP_CONTAINER); + public static final TokenClientParam CONTAINER = new TokenClientParam(SP_CONTAINER); /** * Search parameter constant for content @@ -243,7 +243,7 @@ public class Medication extends BaseResource implements IResource { * Path: Medication.package.content.item
*

*/ - public static final ReferenceParam CONTENT = new ReferenceParam(SP_CONTENT); + public static final ReferenceClientParam CONTENT = new ReferenceClientParam(SP_CONTENT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 473715bd9d7..d70fb94eec0 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 @@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -111,7 +111,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.device
*

*/ - public static final ReferenceParam DEVICE = new ReferenceParam(SP_DEVICE); + public static final ReferenceClientParam DEVICE = new ReferenceClientParam(SP_DEVICE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -138,7 +138,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.encounter
*

*/ - public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER); + public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -165,7 +165,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for medication @@ -186,7 +186,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.medication
*

*/ - public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION); + public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -213,7 +213,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.wasNotGiven
*

*/ - public static final TokenParam NOTGIVEN = new TokenParam(SP_NOTGIVEN); + public static final TokenClientParam NOTGIVEN = new TokenClientParam(SP_NOTGIVEN); /** * Search parameter constant for patient @@ -234,7 +234,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -261,7 +261,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.prescription
*

*/ - public static final ReferenceParam PRESCRIPTION = new ReferenceParam(SP_PRESCRIPTION); + public static final ReferenceClientParam PRESCRIPTION = new ReferenceClientParam(SP_PRESCRIPTION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -288,7 +288,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for whengiven @@ -309,7 +309,7 @@ public class MedicationAdministration extends BaseResource implements IResource * Path: MedicationAdministration.whenGiven
*

*/ - public static final DateParam WHENGIVEN = new DateParam(SP_WHENGIVEN); + public static final DateClientParam WHENGIVEN = new DateClientParam(SP_WHENGIVEN); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 2a02279465e..717624cd44e 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 @@ -67,9 +67,9 @@ import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -114,7 +114,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.dispense.destination
*

*/ - public static final ReferenceParam DESTINATION = new ReferenceParam(SP_DESTINATION); + public static final ReferenceClientParam DESTINATION = new ReferenceClientParam(SP_DESTINATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -141,7 +141,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.dispenser
*

*/ - public static final ReferenceParam DISPENSER = new ReferenceParam(SP_DISPENSER); + public static final ReferenceClientParam DISPENSER = new ReferenceClientParam(SP_DISPENSER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -168,7 +168,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for medication @@ -189,7 +189,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.dispense.medication
*

*/ - public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION); + public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -216,7 +216,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -243,7 +243,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.authorizingPrescription
*

*/ - public static final ReferenceParam PRESCRIPTION = new ReferenceParam(SP_PRESCRIPTION); + public static final ReferenceClientParam PRESCRIPTION = new ReferenceClientParam(SP_PRESCRIPTION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -270,7 +270,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.substitution.responsibleParty
*

*/ - public static final ReferenceParam RESPONSIBLEPARTY = new ReferenceParam(SP_RESPONSIBLEPARTY); + public static final ReferenceClientParam RESPONSIBLEPARTY = new ReferenceClientParam(SP_RESPONSIBLEPARTY); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -297,7 +297,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.dispense.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for type @@ -318,7 +318,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.dispense.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for whenhandedover @@ -339,7 +339,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.dispense.whenHandedOver
*

*/ - public static final DateParam WHENHANDEDOVER = new DateParam(SP_WHENHANDEDOVER); + public static final DateClientParam WHENHANDEDOVER = new DateClientParam(SP_WHENHANDEDOVER); /** * Search parameter constant for whenprepared @@ -360,7 +360,7 @@ public class MedicationDispense extends BaseResource implements IResource { * Path: MedicationDispense.dispense.whenPrepared
*

*/ - public static final DateParam WHENPREPARED = new DateParam(SP_WHENPREPARED); + public static final DateClientParam WHENPREPARED = new DateClientParam(SP_WHENPREPARED); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1) 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 652c724d140..d1148f1af6f 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 @@ -70,9 +70,9 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -117,7 +117,7 @@ public class MedicationPrescription extends BaseResource implements IResource { * Path: MedicationPrescription.dateWritten
*

*/ - public static final DateParam DATEWRITTEN = new DateParam(SP_DATEWRITTEN); + public static final DateClientParam DATEWRITTEN = new DateClientParam(SP_DATEWRITTEN); /** * Search parameter constant for encounter @@ -138,7 +138,7 @@ public class MedicationPrescription extends BaseResource implements IResource { * Path: MedicationPrescription.encounter
*

*/ - public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER); + public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -165,7 +165,7 @@ public class MedicationPrescription extends BaseResource implements IResource { * Path: MedicationPrescription.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for medication @@ -186,7 +186,7 @@ public class MedicationPrescription extends BaseResource implements IResource { * Path: MedicationPrescription.medication
*

*/ - public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION); + public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -213,7 +213,7 @@ public class MedicationPrescription extends BaseResource implements IResource { * Path: MedicationPrescription.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -240,7 +240,7 @@ public class MedicationPrescription extends BaseResource implements IResource { * Path: MedicationPrescription.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 810a75be522..6119e017eaf 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 @@ -61,9 +61,9 @@ import ca.uhn.fhir.model.dstu.composite.ScheduleDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -108,7 +108,7 @@ public class MedicationStatement extends BaseResource implements IResource { * Path: MedicationStatement.device
*

*/ - public static final ReferenceParam DEVICE = new ReferenceParam(SP_DEVICE); + public static final ReferenceClientParam DEVICE = new ReferenceClientParam(SP_DEVICE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -135,7 +135,7 @@ public class MedicationStatement extends BaseResource implements IResource { * Path: MedicationStatement.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for medication @@ -156,7 +156,7 @@ public class MedicationStatement extends BaseResource implements IResource { * Path: MedicationStatement.medication
*

*/ - public static final ReferenceParam MEDICATION = new ReferenceParam(SP_MEDICATION); + public static final ReferenceClientParam MEDICATION = new ReferenceClientParam(SP_MEDICATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -183,7 +183,7 @@ public class MedicationStatement extends BaseResource implements IResource { * Path: MedicationStatement.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -210,7 +210,7 @@ public class MedicationStatement extends BaseResource implements IResource { * Path: MedicationStatement.whenGiven
*

*/ - public static final DateParam WHEN_GIVEN = new DateParam(SP_WHEN_GIVEN); + public static final DateClientParam WHEN_GIVEN = new DateClientParam(SP_WHEN_GIVEN); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 c9b81250a2f..2d3c87fc26a 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 @@ -59,8 +59,8 @@ import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -105,7 +105,7 @@ public class Microarray extends BaseResource implements IResource { * Path: Microarray.subject.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -132,7 +132,7 @@ public class Microarray extends BaseResource implements IResource { * Path: Microarray.sample.gene.identity
*

*/ - public static final StringParam GENE = new StringParam(SP_GENE); + public static final StringClientParam GENE = new StringClientParam(SP_GENE); /** * Search parameter constant for coordinate @@ -153,7 +153,7 @@ public class Microarray extends BaseResource implements IResource { * Path: Microarray.sample.gene.coordinate
*

*/ - public static final StringParam COORDINATE = new StringParam(SP_COORDINATE); + public static final StringClientParam COORDINATE = new StringClientParam(SP_COORDINATE); @Child(name="subject", order=0, min=0, max=Child.MAX_UNLIMITED) 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 40dc80adab5..dd8fa334eb3 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 @@ -74,12 +74,12 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.CompositeParam; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.QuantityParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.QuantityClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -124,7 +124,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.name
*

*/ - public static final TokenParam NAME = new TokenParam(SP_NAME); + public static final TokenClientParam NAME = new TokenClientParam(SP_NAME); /** * Search parameter constant for value-quantity @@ -145,7 +145,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.value[x]
*

*/ - public static final QuantityParam VALUE_QUANTITY = new QuantityParam(SP_VALUE_QUANTITY); + public static final QuantityClientParam VALUE_QUANTITY = new QuantityClientParam(SP_VALUE_QUANTITY); /** * Search parameter constant for value-concept @@ -166,7 +166,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.value[x]
*

*/ - public static final TokenParam VALUE_CONCEPT = new TokenParam(SP_VALUE_CONCEPT); + public static final TokenClientParam VALUE_CONCEPT = new TokenClientParam(SP_VALUE_CONCEPT); /** * Search parameter constant for value-date @@ -187,7 +187,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.value[x]
*

*/ - public static final DateParam VALUE_DATE = new DateParam(SP_VALUE_DATE); + public static final DateClientParam VALUE_DATE = new DateClientParam(SP_VALUE_DATE); /** * Search parameter constant for value-string @@ -208,7 +208,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.value[x]
*

*/ - public static final StringParam VALUE_STRING = new StringParam(SP_VALUE_STRING); + public static final StringClientParam VALUE_STRING = new StringClientParam(SP_VALUE_STRING); /** * Search parameter constant for name-value-[x] @@ -229,7 +229,7 @@ public class Observation extends BaseResource implements IResource { * Path: name & value-[x]
*

*/ - public static final CompositeParam NAME_VALUE_X = new CompositeParam(SP_NAME_VALUE_X); + public static final CompositeClientParam NAME_VALUE_X = new CompositeClientParam(SP_NAME_VALUE_X); /** * Search parameter constant for date @@ -250,7 +250,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.applies[x]
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for status @@ -271,7 +271,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for reliability @@ -292,7 +292,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.reliability
*

*/ - public static final TokenParam RELIABILITY = new TokenParam(SP_RELIABILITY); + public static final TokenClientParam RELIABILITY = new TokenClientParam(SP_RELIABILITY); /** * Search parameter constant for subject @@ -313,7 +313,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -340,7 +340,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.performer
*

*/ - public static final ReferenceParam PERFORMER = new ReferenceParam(SP_PERFORMER); + public static final ReferenceClientParam PERFORMER = new ReferenceClientParam(SP_PERFORMER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -367,7 +367,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.specimen
*

*/ - public static final ReferenceParam SPECIMEN = new ReferenceParam(SP_SPECIMEN); + public static final ReferenceClientParam SPECIMEN = new ReferenceClientParam(SP_SPECIMEN); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -394,7 +394,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.related.type
*

*/ - public static final TokenParam RELATED_TYPE = new TokenParam(SP_RELATED_TYPE); + public static final TokenClientParam RELATED_TYPE = new TokenClientParam(SP_RELATED_TYPE); /** * Search parameter constant for related-target @@ -415,7 +415,7 @@ public class Observation extends BaseResource implements IResource { * Path: Observation.related.target
*

*/ - public static final ReferenceParam RELATED_TARGET = new ReferenceParam(SP_RELATED_TARGET); + public static final ReferenceClientParam RELATED_TARGET = new ReferenceClientParam(SP_RELATED_TARGET); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -442,7 +442,7 @@ public class Observation extends BaseResource implements IResource { * Path: related-target & related-type
*

*/ - public static final CompositeParam RELATED = new CompositeParam(SP_RELATED); + public static final CompositeClientParam RELATED = new CompositeClientParam(SP_RELATED); @Child(name="name", type=CodeableConceptDt.class, order=0, min=1, max=1) 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 268e31c2138..2f2454100ac 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 @@ -59,9 +59,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.composite.ScheduleDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -106,7 +106,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for subject @@ -127,7 +127,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -154,7 +154,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.source
*

*/ - public static final ReferenceParam SOURCE = new ReferenceParam(SP_SOURCE); + public static final ReferenceClientParam SOURCE = new ReferenceClientParam(SP_SOURCE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -181,7 +181,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.target
*

*/ - public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET); + public static final ReferenceClientParam TARGET = new ReferenceClientParam(SP_TARGET); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -208,7 +208,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.authority
*

*/ - public static final ReferenceParam AUTHORITY = new ReferenceParam(SP_AUTHORITY); + public static final ReferenceClientParam AUTHORITY = new ReferenceClientParam(SP_AUTHORITY); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -235,7 +235,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.when.code
*

*/ - public static final TokenParam WHEN_CODE = new TokenParam(SP_WHEN_CODE); + public static final TokenClientParam WHEN_CODE = new TokenClientParam(SP_WHEN_CODE); /** * Search parameter constant for when @@ -256,7 +256,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.when.schedule
*

*/ - public static final DateParam WHEN = new DateParam(SP_WHEN); + public static final DateClientParam WHEN = new DateClientParam(SP_WHEN); /** * Search parameter constant for detail @@ -277,7 +277,7 @@ public class Order extends BaseResource implements IResource { * Path: Order.detail
*

*/ - public static final ReferenceParam DETAIL = new ReferenceParam(SP_DETAIL); + public static final ReferenceClientParam DETAIL = new ReferenceClientParam(SP_DETAIL); /** * Constant for fluent queries to be used to add include statements. Specifies 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 36fea0c025d..4b3d36406c8 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 @@ -59,9 +59,9 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -106,7 +106,7 @@ public class OrderResponse extends BaseResource implements IResource { * Path: OrderResponse.request
*

*/ - public static final ReferenceParam REQUEST = new ReferenceParam(SP_REQUEST); + public static final ReferenceClientParam REQUEST = new ReferenceClientParam(SP_REQUEST); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -133,7 +133,7 @@ public class OrderResponse extends BaseResource implements IResource { * Path: OrderResponse.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for who @@ -154,7 +154,7 @@ public class OrderResponse extends BaseResource implements IResource { * Path: OrderResponse.who
*

*/ - public static final ReferenceParam WHO = new ReferenceParam(SP_WHO); + public static final ReferenceClientParam WHO = new ReferenceClientParam(SP_WHO); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -181,7 +181,7 @@ public class OrderResponse extends BaseResource implements IResource { * Path: OrderResponse.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for fulfillment @@ -202,7 +202,7 @@ public class OrderResponse extends BaseResource implements IResource { * Path: OrderResponse.fulfillment
*

*/ - public static final ReferenceParam FULFILLMENT = new ReferenceParam(SP_FULFILLMENT); + public static final ReferenceClientParam FULFILLMENT = new ReferenceClientParam(SP_FULFILLMENT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 a738cf66ad0..3d34c0323bd 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 @@ -63,9 +63,9 @@ import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -110,7 +110,7 @@ public class Organization extends BaseResource implements IResource { * Path: Organization.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for phonetic @@ -131,7 +131,7 @@ public class Organization extends BaseResource implements IResource { * Path:
*

*/ - public static final StringParam PHONETIC = new StringParam(SP_PHONETIC); + public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC); /** * Search parameter constant for type @@ -152,7 +152,7 @@ public class Organization extends BaseResource implements IResource { * Path: Organization.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for identifier @@ -173,7 +173,7 @@ public class Organization extends BaseResource implements IResource { * Path: Organization.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for partof @@ -194,7 +194,7 @@ public class Organization extends BaseResource implements IResource { * Path: Organization.partOf
*

*/ - public static final ReferenceParam PARTOF = new ReferenceParam(SP_PARTOF); + public static final ReferenceClientParam PARTOF = new ReferenceClientParam(SP_PARTOF); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -221,7 +221,7 @@ public class Organization extends BaseResource implements IResource { * Path: Organization.active
*

*/ - public static final TokenParam ACTIVE = new TokenParam(SP_ACTIVE); + public static final TokenClientParam ACTIVE = new TokenClientParam(SP_ACTIVE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 c341e738787..0369db55200 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 @@ -54,9 +54,9 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -101,7 +101,7 @@ public class Other extends BaseResource implements IResource { * Path: Other.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -128,7 +128,7 @@ public class Other extends BaseResource implements IResource { * Path: Other.created
*

*/ - public static final DateParam CREATED = new DateParam(SP_CREATED); + public static final DateClientParam CREATED = new DateClientParam(SP_CREATED); /** * Search parameter constant for code @@ -149,7 +149,7 @@ public class Other extends BaseResource implements IResource { * Path: Other.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 7553a68cae9..93aef3ef84d 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 @@ -72,10 +72,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -120,7 +120,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for name @@ -141,7 +141,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for family @@ -162,7 +162,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.name.family
*

*/ - public static final StringParam FAMILY = new StringParam(SP_FAMILY); + public static final StringClientParam FAMILY = new StringClientParam(SP_FAMILY); /** * Search parameter constant for given @@ -183,7 +183,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.name.given
*

*/ - public static final StringParam GIVEN = new StringParam(SP_GIVEN); + public static final StringClientParam GIVEN = new StringClientParam(SP_GIVEN); /** * Search parameter constant for phonetic @@ -204,7 +204,7 @@ public class Patient extends BaseResource implements IResource { * Path:
*

*/ - public static final StringParam PHONETIC = new StringParam(SP_PHONETIC); + public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC); /** * Search parameter constant for telecom @@ -225,7 +225,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.telecom
*

*/ - public static final StringParam TELECOM = new StringParam(SP_TELECOM); + public static final StringClientParam TELECOM = new StringClientParam(SP_TELECOM); /** * Search parameter constant for address @@ -246,7 +246,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.address
*

*/ - public static final StringParam ADDRESS = new StringParam(SP_ADDRESS); + public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS); /** * Search parameter constant for gender @@ -267,7 +267,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.gender
*

*/ - public static final TokenParam GENDER = new TokenParam(SP_GENDER); + public static final TokenClientParam GENDER = new TokenClientParam(SP_GENDER); /** * Search parameter constant for language @@ -288,7 +288,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.communication
*

*/ - public static final TokenParam LANGUAGE = new TokenParam(SP_LANGUAGE); + public static final TokenClientParam LANGUAGE = new TokenClientParam(SP_LANGUAGE); /** * Search parameter constant for birthdate @@ -309,7 +309,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.birthDate
*

*/ - public static final DateParam BIRTHDATE = new DateParam(SP_BIRTHDATE); + public static final DateClientParam BIRTHDATE = new DateClientParam(SP_BIRTHDATE); /** * Search parameter constant for provider @@ -330,7 +330,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.managingOrganization
*

*/ - public static final ReferenceParam PROVIDER = new ReferenceParam(SP_PROVIDER); + public static final ReferenceClientParam PROVIDER = new ReferenceClientParam(SP_PROVIDER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -357,7 +357,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.active
*

*/ - public static final TokenParam ACTIVE = new TokenParam(SP_ACTIVE); + public static final TokenClientParam ACTIVE = new TokenClientParam(SP_ACTIVE); /** * Search parameter constant for animal-species @@ -378,7 +378,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.animal.species
*

*/ - public static final TokenParam ANIMAL_SPECIES = new TokenParam(SP_ANIMAL_SPECIES); + public static final TokenClientParam ANIMAL_SPECIES = new TokenClientParam(SP_ANIMAL_SPECIES); /** * Search parameter constant for animal-breed @@ -399,7 +399,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.animal.breed
*

*/ - public static final TokenParam ANIMAL_BREED = new TokenParam(SP_ANIMAL_BREED); + public static final TokenClientParam ANIMAL_BREED = new TokenClientParam(SP_ANIMAL_BREED); /** * Search parameter constant for link @@ -420,7 +420,7 @@ public class Patient extends BaseResource implements IResource { * Path: Patient.link.other
*

*/ - public static final ReferenceParam LINK = new ReferenceParam(SP_LINK); + public static final ReferenceClientParam LINK = new ReferenceClientParam(SP_LINK); /** * Constant for fluent queries to be used to add include statements. Specifies 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 827bc0032fe..15203772bd9 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 @@ -67,9 +67,9 @@ import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -114,7 +114,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for name @@ -135,7 +135,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for family @@ -156,7 +156,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.name
*

*/ - public static final StringParam FAMILY = new StringParam(SP_FAMILY); + public static final StringClientParam FAMILY = new StringClientParam(SP_FAMILY); /** * Search parameter constant for given @@ -177,7 +177,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.name
*

*/ - public static final StringParam GIVEN = new StringParam(SP_GIVEN); + public static final StringClientParam GIVEN = new StringClientParam(SP_GIVEN); /** * Search parameter constant for phonetic @@ -198,7 +198,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.name
*

*/ - public static final StringParam PHONETIC = new StringParam(SP_PHONETIC); + public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC); /** * Search parameter constant for telecom @@ -219,7 +219,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.telecom
*

*/ - public static final StringParam TELECOM = new StringParam(SP_TELECOM); + public static final StringClientParam TELECOM = new StringClientParam(SP_TELECOM); /** * Search parameter constant for address @@ -240,7 +240,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.address
*

*/ - public static final StringParam ADDRESS = new StringParam(SP_ADDRESS); + public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS); /** * Search parameter constant for gender @@ -261,7 +261,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.gender
*

*/ - public static final TokenParam GENDER = new TokenParam(SP_GENDER); + public static final TokenClientParam GENDER = new TokenClientParam(SP_GENDER); /** * Search parameter constant for organization @@ -282,7 +282,7 @@ public class Practitioner extends BaseResource implements IResource { * Path: Practitioner.organization
*

*/ - public static final ReferenceParam ORGANIZATION = new ReferenceParam(SP_ORGANIZATION); + public static final ReferenceClientParam ORGANIZATION = new ReferenceClientParam(SP_ORGANIZATION); /** * Constant for fluent queries to be used to add include statements. Specifies 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 4cdaa7804d1..76706efbe4c 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 @@ -59,9 +59,9 @@ import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -106,7 +106,7 @@ public class Procedure extends BaseResource implements IResource { * Path: Procedure.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for subject @@ -127,7 +127,7 @@ public class Procedure extends BaseResource implements IResource { * Path: Procedure.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -154,7 +154,7 @@ public class Procedure extends BaseResource implements IResource { * Path: Procedure.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 583586f9836..a226db4be34 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 @@ -75,10 +75,10 @@ import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -123,7 +123,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for version @@ -144,7 +144,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.version
*

*/ - public static final TokenParam VERSION = new TokenParam(SP_VERSION); + public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION); /** * Search parameter constant for name @@ -165,7 +165,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for publisher @@ -186,7 +186,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.publisher
*

*/ - public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER); + public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER); /** * Search parameter constant for description @@ -207,7 +207,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.description
*

*/ - public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION); + public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION); /** * Search parameter constant for status @@ -228,7 +228,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for date @@ -249,7 +249,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for code @@ -270,7 +270,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for extension @@ -291,7 +291,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.extensionDefn.code
*

*/ - public static final TokenParam EXTENSION = new TokenParam(SP_EXTENSION); + public static final TokenClientParam EXTENSION = new TokenClientParam(SP_EXTENSION); /** * Search parameter constant for valueset @@ -312,7 +312,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.structure.element.definition.binding.reference[x]
*

*/ - public static final ReferenceParam VALUESET = new ReferenceParam(SP_VALUESET); + public static final ReferenceClientParam VALUESET = new ReferenceClientParam(SP_VALUESET); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -339,7 +339,7 @@ public class Profile extends BaseResource implements IResource { * Path: Profile.structure.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); @Child(name="identifier", type=StringDt.class, order=0, min=0, max=1) 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 9f5f4a92661..751d49b9a7d 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 @@ -62,9 +62,9 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -109,7 +109,7 @@ public class Provenance extends BaseResource implements IResource { * Path: Provenance.target
*

*/ - public static final ReferenceParam TARGET = new ReferenceParam(SP_TARGET); + public static final ReferenceClientParam TARGET = new ReferenceClientParam(SP_TARGET); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -136,7 +136,7 @@ public class Provenance extends BaseResource implements IResource { * Path: Provenance.period.start
*

*/ - public static final DateParam START = new DateParam(SP_START); + public static final DateClientParam START = new DateClientParam(SP_START); /** * Search parameter constant for end @@ -157,7 +157,7 @@ public class Provenance extends BaseResource implements IResource { * Path: Provenance.period.end
*

*/ - public static final DateParam END = new DateParam(SP_END); + public static final DateClientParam END = new DateClientParam(SP_END); /** * Search parameter constant for location @@ -178,7 +178,7 @@ public class Provenance extends BaseResource implements IResource { * Path: Provenance.location
*

*/ - public static final ReferenceParam LOCATION = new ReferenceParam(SP_LOCATION); + public static final ReferenceClientParam LOCATION = new ReferenceClientParam(SP_LOCATION); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -205,7 +205,7 @@ public class Provenance extends BaseResource implements IResource { * Path: Provenance.agent.reference
*

*/ - public static final TokenParam PARTY = new TokenParam(SP_PARTY); + public static final TokenClientParam PARTY = new TokenClientParam(SP_PARTY); /** * Search parameter constant for partytype @@ -226,7 +226,7 @@ public class Provenance extends BaseResource implements IResource { * Path: Provenance.agent.type
*

*/ - public static final TokenParam PARTYTYPE = new TokenParam(SP_PARTYTYPE); + public static final TokenClientParam PARTYTYPE = new TokenClientParam(SP_PARTYTYPE); @Child(name="target", order=0, min=1, max=Child.MAX_UNLIMITED, type={ 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 7381c6bfd2a..7f546de3e7b 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 @@ -56,7 +56,7 @@ import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -101,7 +101,7 @@ public class Query extends BaseResource implements IResource { * Path: Query.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for response @@ -122,7 +122,7 @@ public class Query extends BaseResource implements IResource { * Path: Query.response.identifier
*

*/ - public static final TokenParam RESPONSE = new TokenParam(SP_RESPONSE); + public static final TokenClientParam RESPONSE = new TokenClientParam(SP_RESPONSE); @Child(name="identifier", type=UriDt.class, order=0, min=1, max=1) 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 51aa21ca07a..c376aaeefdc 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 @@ -71,9 +71,9 @@ import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -118,7 +118,7 @@ public class Questionnaire extends BaseResource implements IResource { * Path: Questionnaire.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for authored @@ -139,7 +139,7 @@ public class Questionnaire extends BaseResource implements IResource { * Path: Questionnaire.authored
*

*/ - public static final DateParam AUTHORED = new DateParam(SP_AUTHORED); + public static final DateClientParam AUTHORED = new DateClientParam(SP_AUTHORED); /** * Search parameter constant for subject @@ -160,7 +160,7 @@ public class Questionnaire extends BaseResource implements IResource { * Path: Questionnaire.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -187,7 +187,7 @@ public class Questionnaire extends BaseResource implements IResource { * Path: Questionnaire.author
*

*/ - public static final ReferenceParam AUTHOR = new ReferenceParam(SP_AUTHOR); + public static final ReferenceClientParam AUTHOR = new ReferenceClientParam(SP_AUTHOR); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -214,7 +214,7 @@ public class Questionnaire extends BaseResource implements IResource { * Path: Questionnaire.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for name @@ -235,7 +235,7 @@ public class Questionnaire extends BaseResource implements IResource { * Path: Questionnaire.name
*

*/ - public static final TokenParam NAME = new TokenParam(SP_NAME); + public static final TokenClientParam NAME = new TokenClientParam(SP_NAME); /** * Search parameter constant for encounter @@ -256,7 +256,7 @@ public class Questionnaire extends BaseResource implements IResource { * Path: Questionnaire.encounter
*

*/ - public static final ReferenceParam ENCOUNTER = new ReferenceParam(SP_ENCOUNTER); + public static final ReferenceClientParam ENCOUNTER = new ReferenceClientParam(SP_ENCOUNTER); /** * Constant for fluent queries to be used to add include statements. Specifies 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 541a6a84414..907cb94058b 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 @@ -59,9 +59,9 @@ import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -106,7 +106,7 @@ public class RelatedPerson extends BaseResource implements IResource { * Path: RelatedPerson.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for name @@ -127,7 +127,7 @@ public class RelatedPerson extends BaseResource implements IResource { * Path: RelatedPerson.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for phonetic @@ -148,7 +148,7 @@ public class RelatedPerson extends BaseResource implements IResource { * Path:
*

*/ - public static final StringParam PHONETIC = new StringParam(SP_PHONETIC); + public static final StringClientParam PHONETIC = new StringClientParam(SP_PHONETIC); /** * Search parameter constant for telecom @@ -169,7 +169,7 @@ public class RelatedPerson extends BaseResource implements IResource { * Path: RelatedPerson.telecom
*

*/ - public static final StringParam TELECOM = new StringParam(SP_TELECOM); + public static final StringClientParam TELECOM = new StringClientParam(SP_TELECOM); /** * Search parameter constant for address @@ -190,7 +190,7 @@ public class RelatedPerson extends BaseResource implements IResource { * Path: RelatedPerson.address
*

*/ - public static final StringParam ADDRESS = new StringParam(SP_ADDRESS); + public static final StringClientParam ADDRESS = new StringClientParam(SP_ADDRESS); /** * Search parameter constant for gender @@ -211,7 +211,7 @@ public class RelatedPerson extends BaseResource implements IResource { * Path: RelatedPerson.gender
*

*/ - public static final TokenParam GENDER = new TokenParam(SP_GENDER); + public static final TokenClientParam GENDER = new TokenClientParam(SP_GENDER); /** * Search parameter constant for patient @@ -232,7 +232,7 @@ public class RelatedPerson extends BaseResource implements IResource { * Path: RelatedPerson.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 bed9c91e64b..b7f3d6cc649 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 @@ -54,7 +54,7 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -99,7 +99,7 @@ public class Remittance extends BaseResource implements IResource { * Path: Remittance.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for service @@ -120,7 +120,7 @@ public class Remittance extends BaseResource implements IResource { * Path: Remittance.service.code
*

*/ - public static final TokenParam SERVICE = new TokenParam(SP_SERVICE); + public static final TokenClientParam SERVICE = new TokenClientParam(SP_SERVICE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=1) 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 5dd21e3f310..84617987e6e 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 @@ -71,10 +71,10 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -119,7 +119,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.event.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for action @@ -140,7 +140,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.event.action
*

*/ - public static final TokenParam ACTION = new TokenParam(SP_ACTION); + public static final TokenClientParam ACTION = new TokenClientParam(SP_ACTION); /** * Search parameter constant for date @@ -161,7 +161,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.event.dateTime
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for subtype @@ -182,7 +182,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.event.subtype
*

*/ - public static final TokenParam SUBTYPE = new TokenParam(SP_SUBTYPE); + public static final TokenClientParam SUBTYPE = new TokenClientParam(SP_SUBTYPE); /** * Search parameter constant for user @@ -203,7 +203,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.participant.userId
*

*/ - public static final TokenParam USER = new TokenParam(SP_USER); + public static final TokenClientParam USER = new TokenClientParam(SP_USER); /** * Search parameter constant for name @@ -224,7 +224,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.participant.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for address @@ -245,7 +245,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.participant.network.identifier
*

*/ - public static final TokenParam ADDRESS = new TokenParam(SP_ADDRESS); + public static final TokenClientParam ADDRESS = new TokenClientParam(SP_ADDRESS); /** * Search parameter constant for source @@ -266,7 +266,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.source.identifier
*

*/ - public static final TokenParam SOURCE = new TokenParam(SP_SOURCE); + public static final TokenClientParam SOURCE = new TokenClientParam(SP_SOURCE); /** * Search parameter constant for site @@ -287,7 +287,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.source.site
*

*/ - public static final TokenParam SITE = new TokenParam(SP_SITE); + public static final TokenClientParam SITE = new TokenClientParam(SP_SITE); /** * Search parameter constant for object-type @@ -308,7 +308,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.object.type
*

*/ - public static final TokenParam OBJECT_TYPE = new TokenParam(SP_OBJECT_TYPE); + public static final TokenClientParam OBJECT_TYPE = new TokenClientParam(SP_OBJECT_TYPE); /** * Search parameter constant for identity @@ -329,7 +329,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.object.identifier
*

*/ - public static final TokenParam IDENTITY = new TokenParam(SP_IDENTITY); + public static final TokenClientParam IDENTITY = new TokenClientParam(SP_IDENTITY); /** * Search parameter constant for reference @@ -350,7 +350,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.object.reference
*

*/ - public static final ReferenceParam REFERENCE = new ReferenceParam(SP_REFERENCE); + public static final ReferenceClientParam REFERENCE = new ReferenceClientParam(SP_REFERENCE); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -377,7 +377,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.object.name
*

*/ - public static final StringParam DESC = new StringParam(SP_DESC); + public static final StringClientParam DESC = new StringClientParam(SP_DESC); /** * Search parameter constant for patientid @@ -398,7 +398,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path:
*

*/ - public static final TokenParam PATIENTID = new TokenParam(SP_PATIENTID); + public static final TokenClientParam PATIENTID = new TokenClientParam(SP_PATIENTID); /** * Search parameter constant for altid @@ -419,7 +419,7 @@ public class SecurityEvent extends BaseResource implements IResource { * Path: SecurityEvent.participant.altId
*

*/ - public static final TokenParam ALTID = new TokenParam(SP_ALTID); + public static final TokenClientParam ALTID = new TokenClientParam(SP_ALTID); @Child(name="event", order=0, min=1, max=1) 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 1425615f1b6..d5ea7eedb4b 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 @@ -57,9 +57,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -104,7 +104,7 @@ public class SequencingAnalysis extends BaseResource implements IResource { * Path: SequencingAnalysis.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -131,7 +131,7 @@ public class SequencingAnalysis extends BaseResource implements IResource { * Path: SequencingAnalysis.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for genome @@ -152,7 +152,7 @@ public class SequencingAnalysis extends BaseResource implements IResource { * Path: SequencingAnalysis.genome.name
*

*/ - public static final StringParam GENOME = new StringParam(SP_GENOME); + public static final StringClientParam GENOME = new StringClientParam(SP_GENOME); @Child(name="subject", order=0, min=0, max=1, type={ 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 7535ff5d9d3..58530a2e730 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 @@ -58,9 +58,9 @@ import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -105,7 +105,7 @@ public class SequencingLab extends BaseResource implements IResource { * Path: SequencingLab.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -132,7 +132,7 @@ public class SequencingLab extends BaseResource implements IResource { * Path: SequencingLab.specimen.type
*

*/ - public static final StringParam SPECIMEN = new StringParam(SP_SPECIMEN); + public static final StringClientParam SPECIMEN = new StringClientParam(SP_SPECIMEN); /** * Search parameter constant for date @@ -153,7 +153,7 @@ public class SequencingLab extends BaseResource implements IResource { * Path: SequencingLab.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for organization @@ -174,7 +174,7 @@ public class SequencingLab extends BaseResource implements IResource { * Path: SequencingLab.organization
*

*/ - public static final StringParam ORGANIZATION = new StringParam(SP_ORGANIZATION); + public static final StringClientParam ORGANIZATION = new StringClientParam(SP_ORGANIZATION); /** * Search parameter constant for system-class @@ -195,7 +195,7 @@ public class SequencingLab extends BaseResource implements IResource { * Path: SequencingLab.system.class
*

*/ - public static final StringParam SYSTEM_CLASS = new StringParam(SP_SYSTEM_CLASS); + public static final StringClientParam SYSTEM_CLASS = new StringClientParam(SP_SYSTEM_CLASS); /** * Search parameter constant for system-name @@ -216,7 +216,7 @@ public class SequencingLab extends BaseResource implements IResource { * Path: SequencingLab.system.name
*

*/ - public static final StringParam SYSTEM_NAME = new StringParam(SP_SYSTEM_NAME); + public static final StringClientParam SYSTEM_NAME = new StringClientParam(SP_SYSTEM_NAME); @Child(name="subject", order=0, min=0, max=1, type={ 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 4f99024756f..11a2bf5a4d5 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 @@ -57,9 +57,9 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -104,7 +104,7 @@ public class Slot extends BaseResource implements IResource { * Path: Slot.type
*

*/ - public static final TokenParam SLOTTYPE = new TokenParam(SP_SLOTTYPE); + public static final TokenClientParam SLOTTYPE = new TokenClientParam(SP_SLOTTYPE); /** * Search parameter constant for availability @@ -125,7 +125,7 @@ public class Slot extends BaseResource implements IResource { * Path: Slot.availability
*

*/ - public static final ReferenceParam AVAILABILITY = new ReferenceParam(SP_AVAILABILITY); + public static final ReferenceClientParam AVAILABILITY = new ReferenceClientParam(SP_AVAILABILITY); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -152,7 +152,7 @@ public class Slot extends BaseResource implements IResource { * Path: Slot.start
*

*/ - public static final DateParam START = new DateParam(SP_START); + public static final DateClientParam START = new DateClientParam(SP_START); /** * Search parameter constant for fbtype @@ -173,7 +173,7 @@ public class Slot extends BaseResource implements IResource { * Path: Slot.freeBusyType
*

*/ - public static final TokenParam FBTYPE = new TokenParam(SP_FBTYPE); + public static final TokenClientParam FBTYPE = new TokenClientParam(SP_FBTYPE); @Child(name="identifier", type=IdentifierDt.class, order=0, min=0, max=Child.MAX_UNLIMITED) 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 91e7c24809b..5c04216e051 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 @@ -68,7 +68,7 @@ import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -113,7 +113,7 @@ public class Specimen extends BaseResource implements IResource { * Path: Specimen.subject
*

*/ - public static final ReferenceParam SUBJECT = new ReferenceParam(SP_SUBJECT); + public static final ReferenceClientParam SUBJECT = new ReferenceClientParam(SP_SUBJECT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 8a09ac8bc0f..c778ae51ba7 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 @@ -63,10 +63,10 @@ import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.NumberParam; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -111,7 +111,7 @@ public class Substance extends BaseResource implements IResource { * Path: Substance.type
*

*/ - public static final TokenParam TYPE = new TokenParam(SP_TYPE); + public static final TokenClientParam TYPE = new TokenClientParam(SP_TYPE); /** * Search parameter constant for identifier @@ -132,7 +132,7 @@ public class Substance extends BaseResource implements IResource { * Path: Substance.instance.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for expiry @@ -153,7 +153,7 @@ public class Substance extends BaseResource implements IResource { * Path: Substance.instance.expiry
*

*/ - public static final DateParam EXPIRY = new DateParam(SP_EXPIRY); + public static final DateClientParam EXPIRY = new DateClientParam(SP_EXPIRY); /** * Search parameter constant for quantity @@ -174,7 +174,7 @@ public class Substance extends BaseResource implements IResource { * Path: Substance.instance.quantity
*

*/ - public static final NumberParam QUANTITY = new NumberParam(SP_QUANTITY); + public static final NumberClientParam QUANTITY = new NumberClientParam(SP_QUANTITY); /** * Search parameter constant for substance @@ -195,7 +195,7 @@ public class Substance extends BaseResource implements IResource { * Path: Substance.ingredient.substance
*

*/ - public static final ReferenceParam SUBSTANCE = new ReferenceParam(SP_SUBSTANCE); + public static final ReferenceClientParam SUBSTANCE = new ReferenceClientParam(SP_SUBSTANCE); /** * Constant for fluent queries to be used to add include statements. Specifies 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 72f1f64b902..9d46e2d8f56 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 @@ -64,8 +64,8 @@ import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -110,7 +110,7 @@ public class Supply extends BaseResource implements IResource { * Path: Supply.kind
*

*/ - public static final TokenParam KIND = new TokenParam(SP_KIND); + public static final TokenClientParam KIND = new TokenClientParam(SP_KIND); /** * Search parameter constant for identifier @@ -131,7 +131,7 @@ public class Supply extends BaseResource implements IResource { * Path: Supply.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for status @@ -152,7 +152,7 @@ public class Supply extends BaseResource implements IResource { * Path: Supply.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for patient @@ -173,7 +173,7 @@ public class Supply extends BaseResource implements IResource { * Path: Supply.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -200,7 +200,7 @@ public class Supply extends BaseResource implements IResource { * Path: Supply.dispense.supplier
*

*/ - public static final ReferenceParam SUPPLIER = new ReferenceParam(SP_SUPPLIER); + public static final ReferenceClientParam SUPPLIER = new ReferenceClientParam(SP_SUPPLIER); /** * Constant for fluent queries to be used to add include statements. Specifies @@ -227,7 +227,7 @@ public class Supply extends BaseResource implements IResource { * Path: Supply.dispense.identifier
*

*/ - public static final TokenParam DISPENSEID = new TokenParam(SP_DISPENSEID); + public static final TokenClientParam DISPENSEID = new TokenClientParam(SP_DISPENSEID); /** * Search parameter constant for dispensestatus @@ -248,7 +248,7 @@ public class Supply extends BaseResource implements IResource { * Path: Supply.dispense.status
*

*/ - public static final TokenParam DISPENSESTATUS = new TokenParam(SP_DISPENSESTATUS); + public static final TokenClientParam DISPENSESTATUS = new TokenClientParam(SP_DISPENSESTATUS); @Child(name="kind", type=CodeableConceptDt.class, order=0, min=0, max=1) 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 f01fbfe66fe..6ede007823d 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 @@ -55,9 +55,9 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.ReferenceParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -102,7 +102,7 @@ public class User extends BaseResource implements IResource { * Path: User.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for provider @@ -123,7 +123,7 @@ public class User extends BaseResource implements IResource { * Path: User.provider
*

*/ - public static final TokenParam PROVIDER = new TokenParam(SP_PROVIDER); + public static final TokenClientParam PROVIDER = new TokenClientParam(SP_PROVIDER); /** * Search parameter constant for login @@ -144,7 +144,7 @@ public class User extends BaseResource implements IResource { * Path: User.login
*

*/ - public static final StringParam LOGIN = new StringParam(SP_LOGIN); + public static final StringClientParam LOGIN = new StringClientParam(SP_LOGIN); /** * Search parameter constant for level @@ -165,7 +165,7 @@ public class User extends BaseResource implements IResource { * Path: User.level
*

*/ - public static final TokenParam LEVEL = new TokenParam(SP_LEVEL); + public static final TokenClientParam LEVEL = new TokenClientParam(SP_LEVEL); /** * Search parameter constant for patient @@ -186,7 +186,7 @@ public class User extends BaseResource implements IResource { * Path: User.patient
*

*/ - public static final ReferenceParam PATIENT = new ReferenceParam(SP_PATIENT); + public static final ReferenceClientParam PATIENT = new ReferenceClientParam(SP_PATIENT); /** * Constant for fluent queries to be used to add include statements. Specifies 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 9d9a4e5f38d..eb52fbaa7e8 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 @@ -64,9 +64,9 @@ import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.rest.gclient.DateParam; -import ca.uhn.fhir.rest.gclient.StringParam; -import ca.uhn.fhir.rest.gclient.TokenParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -111,7 +111,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.identifier
*

*/ - public static final TokenParam IDENTIFIER = new TokenParam(SP_IDENTIFIER); + public static final TokenClientParam IDENTIFIER = new TokenClientParam(SP_IDENTIFIER); /** * Search parameter constant for version @@ -132,7 +132,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.version
*

*/ - public static final TokenParam VERSION = new TokenParam(SP_VERSION); + public static final TokenClientParam VERSION = new TokenClientParam(SP_VERSION); /** * Search parameter constant for name @@ -153,7 +153,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.name
*

*/ - public static final StringParam NAME = new StringParam(SP_NAME); + public static final StringClientParam NAME = new StringClientParam(SP_NAME); /** * Search parameter constant for publisher @@ -174,7 +174,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.publisher
*

*/ - public static final StringParam PUBLISHER = new StringParam(SP_PUBLISHER); + public static final StringClientParam PUBLISHER = new StringClientParam(SP_PUBLISHER); /** * Search parameter constant for description @@ -195,7 +195,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.description
*

*/ - public static final StringParam DESCRIPTION = new StringParam(SP_DESCRIPTION); + public static final StringClientParam DESCRIPTION = new StringClientParam(SP_DESCRIPTION); /** * Search parameter constant for status @@ -216,7 +216,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.status
*

*/ - public static final TokenParam STATUS = new TokenParam(SP_STATUS); + public static final TokenClientParam STATUS = new TokenClientParam(SP_STATUS); /** * Search parameter constant for date @@ -237,7 +237,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.date
*

*/ - public static final DateParam DATE = new DateParam(SP_DATE); + public static final DateClientParam DATE = new DateClientParam(SP_DATE); /** * Search parameter constant for system @@ -258,7 +258,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.define.system
*

*/ - public static final TokenParam SYSTEM = new TokenParam(SP_SYSTEM); + public static final TokenClientParam SYSTEM = new TokenClientParam(SP_SYSTEM); /** * Search parameter constant for code @@ -279,7 +279,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.define.concept.code
*

*/ - public static final TokenParam CODE = new TokenParam(SP_CODE); + public static final TokenClientParam CODE = new TokenClientParam(SP_CODE); /** * Search parameter constant for reference @@ -300,7 +300,7 @@ public class ValueSet extends BaseResource implements IResource { * Path: ValueSet.compose.include.system
*

*/ - public static final TokenParam REFERENCE = new TokenParam(SP_REFERENCE); + public static final TokenClientParam REFERENCE = new TokenClientParam(SP_REFERENCE); @Child(name="identifier", type=StringDt.class, order=0, min=0, max=1) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java new file mode 100644 index 00000000000..90cf669709f --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeClientParam.java @@ -0,0 +1,43 @@ +package ca.uhn.fhir.rest.gclient; + +/* + * #%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% + */ + +/** + * Composite params are not yet supported - This is a placeholder. Help welcome! + * + * TODO: implement + */ +public class CompositeClientParam { + + public CompositeClientParam(String theName) { + // TODO Auto-generated constructor stub + } + + /** + * Composite params are not yet supported - This is a placeholder. Help welcome! + * + * TODO: implement + */ + public void notYetSupported() { + //nothig + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java index 67922531355..356a8c44d10 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java @@ -20,24 +20,16 @@ package ca.uhn.fhir.rest.gclient; * #L% */ + /** - * Composite params are not yet supported - This is a placeholder. Help welcome! - * - * TODO: implement + * @deprecated Use {@link CompositeClientParam} instead. That class is identical to this one but was renamed to reduct + * confusing duplicate names in the API. This class will be removed in a future release. */ -public class CompositeParam { +public class CompositeParam extends CompositeClientParam { - public CompositeParam(@SuppressWarnings("unused") String theName) { - // TODO Auto-generated constructor stub + public CompositeParam(String theParamName) { + super(theParamName); } - /** - * Composite params are not yet supported - This is a placeholder. Help welcome! - * - * TODO: implement - */ - public void notYetSupported() { - //nothig - } - + } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java new file mode 100644 index 00000000000..45fb524940c --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateClientParam.java @@ -0,0 +1,142 @@ +package ca.uhn.fhir.rest.gclient; + +/* + * #%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.util.Date; + +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.primitive.DateTimeDt; + +/** + * Date parameter type for use in fluent client interfaces + */ +public class DateClientParam implements IParam { + + private String myParamName; + + @Override + public String getParamName() { + return myParamName; + } + + public DateClientParam(String theParamName) { + myParamName = theParamName; + } + + public IDateSpecifier after() { + return new DateWithPrefix(">"); + } + + public IDateSpecifier afterOrEquals() { + return new DateWithPrefix(">="); + } + + public IDateSpecifier before() { + return new DateWithPrefix("<="); + } + + public IDateSpecifier beforeOrEquals() { + return new DateWithPrefix("<="); + } + + public IDateSpecifier exactly() { + return new DateWithPrefix(""); + } + + private class Criterion implements ICriterion, ICriterionInternal { + + private String myValue; + + public Criterion(String theValue) { + myValue = theValue; + } + + @Override + public String getParameterName() { + return myParamName; + } + + @Override + public String getParameterValue() { + return myValue; + } + + } + + private class DateWithPrefix implements IDateSpecifier { + private String myPrefix; + + public DateWithPrefix(String thePrefix) { + myPrefix = thePrefix; + } + + @Override + public ICriterion day(Date theValue) { + DateTimeDt dt = new DateTimeDt(theValue); + dt.setPrecision(TemporalPrecisionEnum.DAY); + return new Criterion(myPrefix + dt.getValueAsString()); + } + + @Override + public ICriterion day(String theValue) { + DateTimeDt dt = new DateTimeDt(theValue); + dt.setPrecision(TemporalPrecisionEnum.DAY); + return new Criterion(myPrefix + dt.getValueAsString()); + } + + @Override + public ICriterion now() { + DateTimeDt dt = new DateTimeDt(); + dt.setPrecision(TemporalPrecisionEnum.DAY); + return new Criterion(myPrefix + dt.getValueAsString()); + } + + @Override + public ICriterion second(Date theValue) { + DateTimeDt dt = new DateTimeDt(theValue); + dt.setPrecision(TemporalPrecisionEnum.DAY); + return new Criterion(myPrefix + dt.getValueAsString()); + } + + @Override + public ICriterion second(String theValue) { + DateTimeDt dt = new DateTimeDt(theValue); + dt.setPrecision(TemporalPrecisionEnum.DAY); + return new Criterion(myPrefix + dt.getValueAsString()); + } + + } + + public interface IDateSpecifier { + + ICriterion day(Date theValue); + + ICriterion day(String theValue); + + ICriterion now(); + + ICriterion second(Date theValue); + + ICriterion second(String theValue); + + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java index 40ce8b0df1c..9f30bae71f5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java @@ -20,123 +20,16 @@ package ca.uhn.fhir.rest.gclient; * #L% */ -import java.util.Date; - -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.primitive.DateTimeDt; /** - * Date parameter type for use in fluent client interfaces + * @deprecated Use {@link DateClientParam} instead. That class is identical to this one but was renamed to reduct + * confusing duplicate names in the API. This class will be removed in a future release. */ -public class DateParam implements IParam { - - private String myParamName; - - @Override - public String getParamName() { - return myParamName; - } +public class DateParam extends DateClientParam { public DateParam(String theParamName) { - myParamName = theParamName; + super(theParamName); } - public IDateSpecifier after() { - return new DateWithPrefix(">"); - } - - public IDateSpecifier afterOrEquals() { - return new DateWithPrefix(">="); - } - - public IDateSpecifier before() { - return new DateWithPrefix("<="); - } - - public IDateSpecifier beforeOrEquals() { - return new DateWithPrefix("<="); - } - - public IDateSpecifier exactly() { - return new DateWithPrefix(""); - } - - private class Criterion implements ICriterion, ICriterionInternal { - - private String myValue; - - public Criterion(String theValue) { - myValue = theValue; - } - - @Override - public String getParameterName() { - return myParamName; - } - - @Override - public String getParameterValue() { - return myValue; - } - - } - - private class DateWithPrefix implements IDateSpecifier { - private String myPrefix; - - public DateWithPrefix(String thePrefix) { - myPrefix = thePrefix; - } - - @Override - public ICriterion day(Date theValue) { - DateTimeDt dt = new DateTimeDt(theValue); - dt.setPrecision(TemporalPrecisionEnum.DAY); - return new Criterion(myPrefix + dt.getValueAsString()); - } - - @Override - public ICriterion day(String theValue) { - DateTimeDt dt = new DateTimeDt(theValue); - dt.setPrecision(TemporalPrecisionEnum.DAY); - return new Criterion(myPrefix + dt.getValueAsString()); - } - - @Override - public ICriterion now() { - DateTimeDt dt = new DateTimeDt(); - dt.setPrecision(TemporalPrecisionEnum.DAY); - return new Criterion(myPrefix + dt.getValueAsString()); - } - - @Override - public ICriterion second(Date theValue) { - DateTimeDt dt = new DateTimeDt(theValue); - dt.setPrecision(TemporalPrecisionEnum.DAY); - return new Criterion(myPrefix + dt.getValueAsString()); - } - - @Override - public ICriterion second(String theValue) { - DateTimeDt dt = new DateTimeDt(theValue); - dt.setPrecision(TemporalPrecisionEnum.DAY); - return new Criterion(myPrefix + dt.getValueAsString()); - } - - } - - public interface IDateSpecifier { - - ICriterion day(Date theValue); - - ICriterion day(String theValue); - - ICriterion now(); - - ICriterion second(Date theValue); - - ICriterion second(String theValue); - - } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java new file mode 100644 index 00000000000..f993930b053 --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberClientParam.java @@ -0,0 +1,129 @@ +package ca.uhn.fhir.rest.gclient; + +/* + * #%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% + */ + +/** + * Token parameter type for use in fluent client interfaces + */ +public class NumberClientParam implements IParam { + + private String myParamName; + + public NumberClientParam(String theParamName) { + myParamName = theParamName; + } + + public IMatches exactly() { + return new IMatches() { + @Override + public ICriterion number(long theNumber) { + return new StringCriterion(getParamName(), Long.toString(theNumber)); + } + + @Override + public ICriterion number(String theNumber) { + return new StringCriterion(getParamName(), (theNumber)); + } + }; + } + + @Override + public String getParamName() { + return myParamName; + } + + public IMatches greaterThan() { + return new IMatches() { + @Override + public ICriterion number(long theNumber) { + return new StringCriterion(getParamName(), ">" + Long.toString(theNumber)); + } + + @Override + public ICriterion number(String theNumber) { + return new StringCriterion(getParamName(), ">" + (theNumber)); + } + }; + } + + public IMatches greaterThanOrEqual() { + return new IMatches() { + @Override + public ICriterion number(long theNumber) { + return new StringCriterion(getParamName(), ">=" + Long.toString(theNumber)); + } + + @Override + public ICriterion number(String theNumber) { + return new StringCriterion(getParamName(), ">=" + (theNumber)); + } + }; + } + + public IMatches lessThan() { + return new IMatches() { + @Override + public ICriterion number(long theNumber) { + return new StringCriterion(getParamName(), "<" + Long.toString(theNumber)); + } + + @Override + public ICriterion number(String theNumber) { + return new StringCriterion(getParamName(), "<" + (theNumber)); + } + }; + } + + public IMatches lessThanOrEqual() { + return new IMatches() { + @Override + public ICriterion number(long theNumber) { + return new StringCriterion(getParamName(), "<=" + Long.toString(theNumber)); + } + + @Override + public ICriterion number(String theNumber) { + return new StringCriterion(getParamName(), "<=" + (theNumber)); + } + }; + } + + public interface IMatches { + /** + * Creates a search criterion that matches against the given number + * + * @param theNumber + * The number + * @return A criterion + */ + T number(long theNumber); + + /** + * Creates a search criterion that matches against the given number + * + * @param theNumber + * The number + * @return A criterion + */ + T number(String theNumber); + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java index 6cc0f5c1261..1a612a7d2fa 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java @@ -20,110 +20,16 @@ package ca.uhn.fhir.rest.gclient; * #L% */ -/** - * Token parameter type for use in fluent client interfaces - */ -public class NumberParam implements IParam { - private String myParamName; +/** + * @deprecated Use {@link NumberClientParam} instead. That class is identical to this one but was renamed to reduct + * confusing duplicate names in the API. This class will be removed in a future release. + */ +public class NumberParam extends NumberClientParam { public NumberParam(String theParamName) { - myParamName = theParamName; + super(theParamName); } - public IMatches exactly() { - return new IMatches() { - @Override - public ICriterion number(long theNumber) { - return new StringCriterion(getParamName(), Long.toString(theNumber)); - } - - @Override - public ICriterion number(String theNumber) { - return new StringCriterion(getParamName(), (theNumber)); - } - }; - } - - @Override - public String getParamName() { - return myParamName; - } - - public IMatches greaterThan() { - return new IMatches() { - @Override - public ICriterion number(long theNumber) { - return new StringCriterion(getParamName(), ">" + Long.toString(theNumber)); - } - - @Override - public ICriterion number(String theNumber) { - return new StringCriterion(getParamName(), ">" + (theNumber)); - } - }; - } - - public IMatches greaterThanOrEqual() { - return new IMatches() { - @Override - public ICriterion number(long theNumber) { - return new StringCriterion(getParamName(), ">=" + Long.toString(theNumber)); - } - - @Override - public ICriterion number(String theNumber) { - return new StringCriterion(getParamName(), ">=" + (theNumber)); - } - }; - } - - public IMatches lessThan() { - return new IMatches() { - @Override - public ICriterion number(long theNumber) { - return new StringCriterion(getParamName(), "<" + Long.toString(theNumber)); - } - - @Override - public ICriterion number(String theNumber) { - return new StringCriterion(getParamName(), "<" + (theNumber)); - } - }; - } - - public IMatches lessThanOrEqual() { - return new IMatches() { - @Override - public ICriterion number(long theNumber) { - return new StringCriterion(getParamName(), "<=" + Long.toString(theNumber)); - } - - @Override - public ICriterion number(String theNumber) { - return new StringCriterion(getParamName(), "<=" + (theNumber)); - } - }; - } - - public interface IMatches { - /** - * Creates a search criterion that matches against the given number - * - * @param theNumber - * The number - * @return A criterion - */ - T number(long theNumber); - - /** - * Creates a search criterion that matches against the given number - * - * @param theNumber - * The number - * @return A criterion - */ - T number(String theNumber); - } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java new file mode 100644 index 00000000000..9045801b4b3 --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java @@ -0,0 +1,176 @@ +package ca.uhn.fhir.rest.gclient; + +/* + * #%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 static org.apache.commons.lang3.StringUtils.*; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; +import ca.uhn.fhir.rest.gclient.NumberClientParam.IMatches; + +/** + * Token parameter type for use in fluent client interfaces + */ +public class QuantityClientParam implements IParam { + + private String myParamName; + + public QuantityClientParam(String theParamName) { + myParamName = theParamName; + } + + public IMatches approximately() { + return new NumberClientParam.IMatches() { + @Override + public IAndUnits number(long theNumber) { + return new AndUnits("~", Long.toString(theNumber)); + } + + @Override + public IAndUnits number(String theNumber) { + return new AndUnits("~", theNumber); + } + }; + } + + public IMatches exactly() { + return new NumberClientParam.IMatches() { + @Override + public IAndUnits number(long theNumber) { + return new AndUnits("", Long.toString(theNumber)); + } + + @Override + public IAndUnits number(String theNumber) { + return new AndUnits("", theNumber); + } + }; + } + + @Override + public String getParamName() { + return myParamName; + } + + public IMatches greaterThan() { + return new NumberClientParam.IMatches() { + @Override + public IAndUnits number(long theNumber) { + return new AndUnits(">", Long.toString(theNumber)); + } + + @Override + public IAndUnits number(String theNumber) { + return new AndUnits(">", theNumber); + } + }; + } + + public IMatches greaterThanOrEquals() { + return new NumberClientParam.IMatches() { + @Override + public IAndUnits number(long theNumber) { + return new AndUnits(">=", Long.toString(theNumber)); + } + + @Override + public IAndUnits number(String theNumber) { + return new AndUnits(">=", theNumber); + } + }; + } + + public IMatches lessThan() { + return new NumberClientParam.IMatches() { + @Override + public IAndUnits number(long theNumber) { + return new AndUnits("<", Long.toString(theNumber)); + } + + @Override + public IAndUnits number(String theNumber) { + return new AndUnits("<", theNumber); + } + }; + } + + public IMatches lessThanOrEquals() { + return new NumberClientParam.IMatches() { + @Override + public IAndUnits number(long theNumber) { + return new AndUnits("<=", Long.toString(theNumber)); + } + + @Override + public IAndUnits number(String theNumber) { + return new AndUnits("<=", theNumber); + } + }; + } + + public IMatches withComparator(QuantityCompararatorEnum theComparator) { + final String cmp = theComparator != null ? theComparator.getCode() : ""; + return new NumberClientParam.IMatches() { + @Override + public IAndUnits number(long theNumber) { + return new AndUnits(cmp, Long.toString(theNumber)); + } + + @Override + public IAndUnits number(String theNumber) { + return new AndUnits(cmp, theNumber); + } + }; + } + + public interface IAndUnits { + + ICriterion andNoUnits(); + + ICriterion andUnits(String theUnits); + + ICriterion andUnits(String theSystem, String theUnits); + } + + private class AndUnits implements IAndUnits { + + private String myToken1; + + public AndUnits(String theComparator, String theNumber) { + myToken1 = defaultString(theComparator) + defaultString(theNumber); + } + + @Override + public ICriterion andNoUnits() { + return andUnits(null, null); + } + + @Override + public ICriterion andUnits(String theUnits) { + return andUnits(theUnits, null); + } + + @Override + public ICriterion andUnits(String theSystem, String theUnits) { + return new StringCriterion(getParamName(), myToken1 + "|" + defaultString(theSystem) + "|" + defaultString(theUnits)); + } + + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java index ee532b19344..ca0ac6074d5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java @@ -20,157 +20,16 @@ package ca.uhn.fhir.rest.gclient; * #L% */ -import static org.apache.commons.lang3.StringUtils.*; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.rest.gclient.NumberParam.IMatches; /** - * Token parameter type for use in fluent client interfaces + * @deprecated Use {@link QuantityClientParam} instead. That class is identical to this one but was renamed to reduct + * confusing duplicate names in the API. This class will be removed in a future release. */ -public class QuantityParam implements IParam { - - private String myParamName; +public class QuantityParam extends QuantityClientParam { public QuantityParam(String theParamName) { - myParamName = theParamName; + super(theParamName); } - public IMatches approximately() { - return new NumberParam.IMatches() { - @Override - public IAndUnits number(long theNumber) { - return new AndUnits("~", Long.toString(theNumber)); - } - - @Override - public IAndUnits number(String theNumber) { - return new AndUnits("~", theNumber); - } - }; - } - - public IMatches exactly() { - return new NumberParam.IMatches() { - @Override - public IAndUnits number(long theNumber) { - return new AndUnits("", Long.toString(theNumber)); - } - - @Override - public IAndUnits number(String theNumber) { - return new AndUnits("", theNumber); - } - }; - } - - @Override - public String getParamName() { - return myParamName; - } - - public IMatches greaterThan() { - return new NumberParam.IMatches() { - @Override - public IAndUnits number(long theNumber) { - return new AndUnits(">", Long.toString(theNumber)); - } - - @Override - public IAndUnits number(String theNumber) { - return new AndUnits(">", theNumber); - } - }; - } - - public IMatches greaterThanOrEquals() { - return new NumberParam.IMatches() { - @Override - public IAndUnits number(long theNumber) { - return new AndUnits(">=", Long.toString(theNumber)); - } - - @Override - public IAndUnits number(String theNumber) { - return new AndUnits(">=", theNumber); - } - }; - } - - public IMatches lessThan() { - return new NumberParam.IMatches() { - @Override - public IAndUnits number(long theNumber) { - return new AndUnits("<", Long.toString(theNumber)); - } - - @Override - public IAndUnits number(String theNumber) { - return new AndUnits("<", theNumber); - } - }; - } - - public IMatches lessThanOrEquals() { - return new NumberParam.IMatches() { - @Override - public IAndUnits number(long theNumber) { - return new AndUnits("<=", Long.toString(theNumber)); - } - - @Override - public IAndUnits number(String theNumber) { - return new AndUnits("<=", theNumber); - } - }; - } - - public IMatches withComparator(QuantityCompararatorEnum theComparator) { - final String cmp = theComparator != null ? theComparator.getCode() : ""; - return new NumberParam.IMatches() { - @Override - public IAndUnits number(long theNumber) { - return new AndUnits(cmp, Long.toString(theNumber)); - } - - @Override - public IAndUnits number(String theNumber) { - return new AndUnits(cmp, theNumber); - } - }; - } - - public interface IAndUnits { - - ICriterion andNoUnits(); - - ICriterion andUnits(String theUnits); - - ICriterion andUnits(String theSystem, String theUnits); - } - - private class AndUnits implements IAndUnits { - - private String myToken1; - - public AndUnits(String theComparator, String theNumber) { - myToken1 = defaultString(theComparator) + defaultString(theNumber); - } - - @Override - public ICriterion andNoUnits() { - return andUnits(null, null); - } - - @Override - public ICriterion andUnits(String theUnits) { - return andUnits(theUnits, null); - } - - @Override - public ICriterion andUnits(String theSystem, String theUnits) { - return new StringCriterion(getParamName(), myToken1 + "|" + defaultString(theSystem) + "|" + defaultString(theUnits)); - } - - } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java new file mode 100644 index 00000000000..0777a59f466 --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceClientParam.java @@ -0,0 +1,81 @@ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.model.primitive.IdDt; + +/* + * #%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% + */ + + +public class ReferenceClientParam implements IParam { + + private String myName; + + public ReferenceClientParam(String theName) { + myName = theName; + } + + @Override + public String getParamName() { + return myName; + } + + public ICriterion hasChainedProperty(ICriterion theICriterion) { + return new ReferenceChainCriterion(getParamName(), theICriterion); + } + + /** + * Match the referenced resource if the resource has the given ID (this can be + * the logical ID or the absolute URL of the resource) + */ + public ICriterion hasId(IdDt theId) { + return new StringCriterion(getParamName(), theId.getValue()); + } + + /** + * Match the referenced resource if the resource has the given ID (this can be + * the logical ID or the absolute URL of the resource) + */ + public ICriterion hasId(String theId) { + return new StringCriterion(getParamName(), theId); + } + + private static class ReferenceChainCriterion implements ICriterion, ICriterionInternal { + + private String myParamName; + private ICriterionInternal myWrappedCriterion; + + public ReferenceChainCriterion(String theParamName, ICriterion theWrappedCriterion) { + myParamName = theParamName; + myWrappedCriterion = (ICriterionInternal) theWrappedCriterion; + } + + @Override + public String getParameterName() { + return myParamName + "." + myWrappedCriterion.getParameterName(); + } + + @Override + public String getParameterValue() { + return myWrappedCriterion.getParameterValue(); + } + + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java index 918c4961311..2ac205d616d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java @@ -1,7 +1,5 @@ package ca.uhn.fhir.rest.gclient; -import ca.uhn.fhir.model.primitive.IdDt; - /* * #%L * HAPI FHIR - Core Library @@ -23,59 +21,15 @@ import ca.uhn.fhir.model.primitive.IdDt; */ -public class ReferenceParam implements IParam { +/** + * @deprecated Use {@link ReferenceClientParam} instead. That class is identical to this one but was renamed to reduct + * confusing duplicate names in the API. This class will be removed in a future release. + */ +public class ReferenceParam extends ReferenceClientParam { - private String myName; - - public ReferenceParam(String theName) { - myName = theName; + public ReferenceParam(String theParamName) { + super(theParamName); } - @Override - public String getParamName() { - return myName; - } - - public ICriterion hasChainedProperty(ICriterion theICriterion) { - return new ReferenceChainCriterion(getParamName(), theICriterion); - } - - /** - * Match the referenced resource if the resource has the given ID (this can be - * the logical ID or the absolute URL of the resource) - */ - public ICriterion hasId(IdDt theId) { - return new StringCriterion(getParamName(), theId.getValue()); - } - - /** - * Match the referenced resource if the resource has the given ID (this can be - * the logical ID or the absolute URL of the resource) - */ - public ICriterion hasId(String theId) { - return new StringCriterion(getParamName(), theId); - } - - private static class ReferenceChainCriterion implements ICriterion, ICriterionInternal { - - private String myParamName; - private ICriterionInternal myWrappedCriterion; - - public ReferenceChainCriterion(String theParamName, ICriterion theWrappedCriterion) { - myParamName = theParamName; - myWrappedCriterion = (ICriterionInternal) theWrappedCriterion; - } - - @Override - public String getParameterName() { - return myParamName + "." + myWrappedCriterion.getParameterName(); - } - - @Override - public String getParameterValue() { - return myWrappedCriterion.getParameterValue(); - } - - } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java new file mode 100644 index 00000000000..2ad23bfb7ec --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java @@ -0,0 +1,92 @@ +package ca.uhn.fhir.rest.gclient; + +/* + * #%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 ca.uhn.fhir.model.primitive.StringDt; +import ca.uhn.fhir.rest.server.Constants; + +/** + * + * @author james + * + */ +public class StringClientParam implements IParam { + + private final String myParamName; + + public StringClientParam(String theParamName) { + myParamName = theParamName; + } + + @Override + public String getParamName() { + return myParamName; + } + + + /** + * The string matches the given value (servers will often, but are not required to) implement this as a left match, + * meaning that a value of "smi" would match "smi" and "smith". + */ + public IStringMatch matches() { + return new StringMatches(); + } + + /** + * The string matches exactly the given value + */ + public IStringMatch matchesExactly() { + return new StringExactly(); + } + + public interface IStringMatch { + + ICriterion value(String theValue); + + ICriterion value(StringDt theValue); + + } + + private class StringExactly implements IStringMatch { + @Override + public ICriterion value(String theValue) { + return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue); + } + + @Override + public ICriterion value(StringDt theValue) { + return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue.getValue()); + } + } + + private class StringMatches implements IStringMatch { + @Override + public ICriterion value(String theValue) { + return new StringCriterion(getParamName(), theValue); + } + + @Override + public ICriterion value(StringDt theValue) { + return new StringCriterion(getParamName(), theValue.getValue()); + } + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java index 09739ec65db..96463a92431 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java @@ -20,73 +20,16 @@ package ca.uhn.fhir.rest.gclient; * #L% */ -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.rest.server.Constants; /** - * - * @author james - * + * @deprecated Use {@link StringClientParam} instead. That class is identical to this one but was renamed to reduct + * confusing duplicate names in the API. This class will be removed in a future release. */ -public class StringParam implements IParam { - - private final String myParamName; +public class StringParam extends StringClientParam { public StringParam(String theParamName) { - myParamName = theParamName; + super(theParamName); } - @Override - public String getParamName() { - return myParamName; - } - - - /** - * The string matches the given value (servers will often, but are not required to) implement this as a left match, - * meaning that a value of "smi" would match "smi" and "smith". - */ - public IStringMatch matches() { - return new StringMatches(); - } - - /** - * The string matches exactly the given value - */ - public IStringMatch matchesExactly() { - return new StringExactly(); - } - - public interface IStringMatch { - - ICriterion value(String theValue); - - ICriterion value(StringDt theValue); - - } - - private class StringExactly implements IStringMatch { - @Override - public ICriterion value(String theValue) { - return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue); - } - - @Override - public ICriterion value(StringDt theValue) { - return new StringCriterion(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue.getValue()); - } - } - - private class StringMatches implements IStringMatch { - @Override - public ICriterion value(String theValue) { - return new StringCriterion(getParamName(), theValue); - } - - @Override - public ICriterion value(StringDt theValue) { - return new StringCriterion(getParamName(), theValue.getValue()); - } - } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java new file mode 100644 index 00000000000..3e59ec11f57 --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java @@ -0,0 +1,122 @@ +package ca.uhn.fhir.rest.gclient; + +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; + +/* + * #%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% + */ + + +/** + * Token parameter type for use in fluent client interfaces + */ +public class TokenClientParam implements IParam { + + private String myParamName; + + @Override + public String getParamName() { + return myParamName; + } + + public TokenClientParam(String theParamName) { + myParamName = theParamName; + } + + public IMatches exactly() { + return new IMatches() { + @Override + public ICriterion systemAndCode(String theSystem, String theCode) { + return new TokenCriterion(getParamName(), theSystem, theCode); + } + + @Override + public ICriterion systemAndIdentifier(String theSystem, String theCode) { + return new TokenCriterion(getParamName(), theSystem, theCode); + } + + @Override + public ICriterion code(String theCode) { + return new TokenCriterion(getParamName(), null, theCode); + } + + @Override + public ICriterion identifier(String theIdentifier) { + return new TokenCriterion(getParamName(), null, theIdentifier); + } + + @Override + public ICriterion identifier(IdentifierDt theIdentifier) { + return new TokenCriterion(getParamName(), theIdentifier.getSystem().getValueAsString(), theIdentifier.getValue().getValue()); + } + }; + } + + public interface IMatches { + /** + * Creates a search criterion that matches against the given code system and code + * + * @param theSystem + * The code system (should be a URI) + * @param theCode + * The code + * @return A criterion + */ + ICriterion systemAndCode(String theSystem, String theCode); + + /** + * Creates a search criterion that matches against the given system and identifier + * + * @param theSystem + * The code system (should be a URI) + * @param theIdentifier + * The identifier + * @return A criterion + */ + ICriterion systemAndIdentifier(String theSystem, String theIdentifier); + + /** + * Creates a search criterion that matches against the given identifier, with no system specified + * + * @param theIdentifier + * The identifier + * @return A criterion + */ + ICriterion identifier(String theIdentifier); + + /** + * Creates a search criterion that matches against the given code, with no code system specified + * + * @param theIdentifier + * The identifier + * @return A criterion + */ + ICriterion code(String theIdentifier); + + /** + * Creates a search criterion that matches against the given identifier (system and code if both are present, or whatever is present) + * + * @param theIdentifier + * The identifier + * @return A criterion + */ + ICriterion identifier(IdentifierDt theIdentifier); + } + +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java index 1aab7e56988..490af813d46 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java @@ -1,7 +1,5 @@ package ca.uhn.fhir.rest.gclient; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; - /* * #%L * HAPI FHIR - Core Library @@ -24,99 +22,14 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt; /** - * Token parameter type for use in fluent client interfaces + * @deprecated Use {@link TokenClientParam} instead. That class is identical to this one but was renamed to reduct + * confusing duplicate names in the API. This class will be removed in a future release. */ -public class TokenParam implements IParam { - - private String myParamName; - - @Override - public String getParamName() { - return myParamName; - } +public class TokenParam extends TokenClientParam { public TokenParam(String theParamName) { - myParamName = theParamName; + super(theParamName); } - public IMatches exactly() { - return new IMatches() { - @Override - public ICriterion systemAndCode(String theSystem, String theCode) { - return new TokenCriterion(getParamName(), theSystem, theCode); - } - - @Override - public ICriterion systemAndIdentifier(String theSystem, String theCode) { - return new TokenCriterion(getParamName(), theSystem, theCode); - } - - @Override - public ICriterion code(String theCode) { - return new TokenCriterion(getParamName(), null, theCode); - } - - @Override - public ICriterion identifier(String theIdentifier) { - return new TokenCriterion(getParamName(), null, theIdentifier); - } - - @Override - public ICriterion identifier(IdentifierDt theIdentifier) { - return new TokenCriterion(getParamName(), theIdentifier.getSystem().getValueAsString(), theIdentifier.getValue().getValue()); - } - }; - } - - public interface IMatches { - /** - * Creates a search criterion that matches against the given code system and code - * - * @param theSystem - * The code system (should be a URI) - * @param theCode - * The code - * @return A criterion - */ - ICriterion systemAndCode(String theSystem, String theCode); - - /** - * Creates a search criterion that matches against the given system and identifier - * - * @param theSystem - * The code system (should be a URI) - * @param theIdentifier - * The identifier - * @return A criterion - */ - ICriterion systemAndIdentifier(String theSystem, String theIdentifier); - - /** - * Creates a search criterion that matches against the given identifier, with no system specified - * - * @param theIdentifier - * The identifier - * @return A criterion - */ - ICriterion identifier(String theIdentifier); - - /** - * Creates a search criterion that matches against the given code, with no code system specified - * - * @param theIdentifier - * The identifier - * @return A criterion - */ - ICriterion code(String theIdentifier); - - /** - * Creates a search criterion that matches against the given identifier (system and code if both are present, or whatever is present) - * - * @param theIdentifier - * The identifier - * @return A criterion - */ - ICriterion identifier(IdentifierDt theIdentifier); - } } diff --git a/hapi-fhir-base/src/site/example/java/example/RestfulPatientResourceProviderMore.java b/hapi-fhir-base/src/site/example/java/example/RestfulPatientResourceProviderMore.java index f5615afb433..183023b14a8 100644 --- a/hapi-fhir-base/src/site/example/java/example/RestfulPatientResourceProviderMore.java +++ b/hapi-fhir-base/src/site/example/java/example/RestfulPatientResourceProviderMore.java @@ -1,6 +1,7 @@ package example; import java.io.IOException; +import java.lang.annotation.Documented; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -17,6 +18,7 @@ import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.api.Tag; import ca.uhn.fhir.model.api.TagList; import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.TagListParam; import ca.uhn.fhir.model.dstu.composite.CodingDt; import ca.uhn.fhir.model.dstu.resource.Conformance; @@ -150,11 +152,34 @@ return retVal; //END SNIPPET: reference +//START SNIPPET: referenceChain +@Search +public List findObservations( + @RequiredParam(name=Observation.SP_SUBJECT+'.'+Patient.SP_IDENTIFIER) TokenParam theProvider + ) { + + String system = theProvider.getSystem(); + String identifier = theProvider.getValue(); + + // ...Do a search for all observations for the given subject... + + List retVal=new ArrayList(); // populate this + return retVal; + +} +//END SNIPPET: referenceChain + + //START SNIPPET: read @Read() public Patient getResourceById(@IdParam IdDt theId) { Patient retVal = new Patient(); + // ...populate... + retVal.addIdentifier().setSystem("urn:mrns").setValue("12345").setLabel("MRN 12345"); + retVal.addName().addFamily("Smith").addGiven("Tester").addGiven("Q"); + // ...etc... + return retVal; } //END SNIPPET: read @@ -196,7 +221,15 @@ public List getPatientHistory(@IdParam IdDt theId) { @Read(version=true) public Patient readOrVread(@IdParam IdDt theId) { Patient retVal = new Patient(); + + if (theId.hasVersionIdPart()) { + // this is a vread + } else { + // this is a read + } + // ...populate... + return retVal; } //END SNIPPET: vread @@ -204,8 +237,6 @@ public Patient readOrVread(@IdParam IdDt theId) { //START SNIPPET: searchStringParam @Search() public List searchByLastName(@RequiredParam(name=Patient.SP_FAMILY) StringParam theFamily) { - List retVal = new ArrayList(); - String valueToMatch = theFamily.getValue(); if (theFamily.isExact()) { @@ -215,6 +246,28 @@ public List searchByLastName(@RequiredParam(name=Patient.SP_FAMILY) Str } // ...populate... + Patient patient = new Patient(); + patient.addIdentifier().setSystem("urn:mrns").setValue("12345").setLabel("MRN 12345"); + patient.addName().addFamily("Smith").addGiven("Tester").addGiven("Q"); + // ...etc... + + /* + * Every returned resource must have its logical ID set. If the server + * supports versioning, that should be set too + */ + String logicalId = "4325"; + String versionId = "2"; // optional + patient.setId(new IdDt("Patient", logicalId, versionId)); + + /* + * This is obviously a fairly contrived example since we are always + * just returning the same hardcoded patient, but in a real scenario + * you could return as many resources as you wanted, and they + * should actually match the given search criteria. + */ + List retVal = new ArrayList(); + retVal.add(patient); + return retVal; } //END SNIPPET: searchStringParam @@ -253,6 +306,23 @@ public List searchByNames( @RequiredParam(name=Patient.SP_FAMILY) Strin } //END SNIPPET: searchOptionalParam +//START SNIPPET: searchWithDocs +@Description(shortDefinition="This search finds all patient resources matching a given name combination") +@Search() +public List searchWithDocs( + @Description(shortDefinition="This is the patient's last name - Supports partial matches") + @RequiredParam(name=Patient.SP_FAMILY) StringParam theFamilyName, + + @Description(shortDefinition="This is the patient's given names") + @OptionalParam(name=Patient.SP_GIVEN) StringParam theGivenName ) { + + List retVal = new ArrayList(); + // ...populate... + return retVal; +} +//END SNIPPET: searchWithDocs + + //START SNIPPET: searchMultiple @Search() public List searchByObservationNames( @RequiredParam(name=Observation.SP_NAME) TokenOrListParam theCodings ) { @@ -498,10 +568,8 @@ public abstract MethodOutcome updateSomePatient(@IdParam IdDt theId, @ResourcePa @Validate public MethodOutcome validatePatient(@ResourceParam Patient thePatient) { - /* - * Actually do our validation: The UnprocessableEntityException - * results in an HTTP 422, which is appropriate for business rule failure - */ + // Actually do our validation: The UnprocessableEntityException + // results in an HTTP 422, which is appropriate for business rule failure if (thePatient.getIdentifierFirstRep().isEmpty()) { /* It is also possible to pass an OperationOutcome resource * to the UnprocessableEntityException if you want to return diff --git a/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml b/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml index 92f986bae4c..cc80fc6004e 100644 --- a/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml +++ b/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml @@ -488,8 +488,8 @@

Parameters which take a string as their format should use the - StringParameter - type. They may also use normal java Strings (or HAPI's StringDt), although it is + StringParam + type. They may also use normal java Strings, although it is not possible to use the ":exact" qualifier in that case.

@@ -507,11 +507,6 @@ -

- Searches method parameters may be of any type that implements the - IQueryParameterType - interface. -

The "token" type is used for parameters which have two parts, such as an idnetifier (which has a system URI, as well as the actual identifier) @@ -537,7 +532,7 @@

The FHIR specification provides a sytax for specifying - dates (and date/times as well, but for simplicity we will just say dates here) + dates+times (but for simplicity we will just say dates here) as search criteria.

@@ -550,8 +545,7 @@

To accept a qualified date parameter, use the - QualifiedDateParam - parameter type. + DateParam parameter type.

@@ -716,6 +710,21 @@ Resource by chained parameter value: http://fhir.example.com/Patient?provider:Organization.name=FooOrg

+

Static Chains

+ +

+ It is also possible to explicitly state a chained value right in the parameter name. + This is useful if you want to only support a search by a specific given chained + parameter. It has the added bonus that you can use the correct parameter type of + the chained parameter (in this case a TokenParameter because the Patient.identifier + parameter is a token) +

+ + + + + + @@ -723,7 +732,6 @@

Search methods may take multiple parameters, and these parameters may (or may not) be optional. - aaaa To add a second required parameter, annotate the parameter with @RequiredParam @@ -743,6 +751,25 @@ only @OptionalParam parameters, or any combination of the two.

+

+ If you wish to create a server that can accept any combination of a large number + of parameters, (this is how the various reference servers behave, as well as the + public HAPI server) + the easiest way to accomplish this is to simply create one method + with all allowable parameters, each annotated as @OptionalParam. +

+ +

+ On the other hand, if you have specific combinations of parameters you wish to + support (a common scenario if you are building FHIR on top of existing data sources + and only have certain indexes you can use) you could create multiple search methods, + each with specific required and optional parameters matching the database indexes. +

+ +

+ The following example shows a method with two parameters. +

+ @@ -758,7 +785,7 @@ - +

It is possible to accept multiple values of a single parameter @@ -853,7 +880,7 @@

Example URL to invoke this method:
- http://fhir.example.com/DiagnosticReport?subject.identifier=7000135&_include=DiagnosticReport.subject + http://fhir.example.com/DiagnosticReport?identifier=7000135&_include=DiagnosticReport.subject

@@ -869,6 +896,25 @@ + + +

+ It is also possible to annotate search methods and/or parameters with + the + @Description + annotation. This annotation allows you to add a description of the method + and the individual parameters. These descriptions will be placed in the + server's metadata statement, which cam be helpful to anyone who is developing + software against your server. +

+ + + + + + + +

@@ -948,7 +994,7 @@ validate - tests whether a resource passes business validation, and would be + operation tests whether a resource passes business validation, and would be acceptable for saving to a server (e.g. by a create or update method).

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDao.java index ac1f8cf53dd..377a554f64f 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDao.java @@ -150,29 +150,28 @@ public class FhirResourceDao extends BaseFhirDao implements Predicate lb = null; if (lowerBound != null) { Predicate gt = builder.greaterThanOrEqualTo(from. get("myValueLow"), lowerBound); - Predicate gin = builder.isNull(from.get("myValueLow")); - Predicate lbo = builder.or(gt, gin); - Predicate lt = builder.greaterThanOrEqualTo(from. get("myValueHigh"), lowerBound); - Predicate lin = builder.isNull(from.get("myValueHigh")); - Predicate hbo = builder.or(lt, lin); - lb = builder.or(gt, lt); + +// Predicate gin = builder.isNull(from.get("myValueLow")); +// Predicate lbo = builder.or(gt, gin); +// Predicate lin = builder.isNull(from.get("myValueHigh")); +// Predicate hbo = builder.or(lt, lin); // lb = builder.and(lbo, hbo); } Predicate ub = null; if (upperBound != null) { Predicate gt = builder.lessThanOrEqualTo(from. get("myValueLow"), upperBound); - Predicate gin = builder.isNull(from.get("myValueLow")); - Predicate lbo = builder.or(gt, gin); - Predicate lt = builder.lessThanOrEqualTo(from. get("myValueHigh"), upperBound); - Predicate lin = builder.isNull(from.get("myValueHigh")); - Predicate ubo = builder.or(lt, lin); - ub = builder.or(gt, lt); + +// Predicate gin = builder.isNull(from.get("myValueLow")); +// Predicate lbo = builder.or(gt, gin); +// Predicate lin = builder.isNull(from.get("myValueHigh")); +// Predicate ubo = builder.or(lt, lin); // ub = builder.and(ubo, lbo); + } if (lb != null && ub != null) { @@ -208,6 +207,9 @@ public class FhirResourceDao extends BaseFhirDao implements return found; } +// private Set addPredicateComposite(String theParamName, Set thePids, List theList) { +// } + private Set addPredicateQuantity(String theParamName, Set thePids, List theList) { if (theList == null || theList.isEmpty()) { return thePids; @@ -1189,7 +1191,6 @@ public class FhirResourceDao extends BaseFhirDao implements private MethodOutcome toMethodOutcome(final ResourceTable entity) { MethodOutcome outcome = new MethodOutcome(); outcome.setId(entity.getIdDt()); - outcome.setVersionId(new IdDt(entity.getVersion())); return outcome; } diff --git a/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java b/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java index b74763bb251..bf159c58282 100644 --- a/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java +++ b/hapi-fhir-jpaserver-test/src/test/java/ca/uhn/fhir/jpa/test/CompleteResourceProviderTest.java @@ -3,9 +3,6 @@ package ca.uhn.fhir.jpa.test; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import java.util.Collections; -import java.util.List; - import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -17,29 +14,20 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.dao.IFhirSystemDao; -import ca.uhn.fhir.jpa.provider.JpaConformanceProvider; import ca.uhn.fhir.jpa.provider.JpaSystemProvider; import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider; import ca.uhn.fhir.model.api.Bundle; -import ca.uhn.fhir.model.api.BundleEntry; -import ca.uhn.fhir.model.api.ExtensionDt; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.resource.Conformance; -import ca.uhn.fhir.model.dstu.resource.Conformance.Rest; -import ca.uhn.fhir.model.dstu.resource.Conformance.RestResource; import ca.uhn.fhir.model.dstu.resource.Observation; import ca.uhn.fhir.model.dstu.resource.Organization; import ca.uhn.fhir.model.dstu.resource.Patient; import ca.uhn.fhir.model.dstu.resource.Questionnaire; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; import ca.uhn.fhir.rest.client.IGenericClient; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; -import ca.uhn.fhir.util.ExtensionConstants; import ca.uhn.test.jpasrv.ObservationResourceProvider; import ca.uhn.test.jpasrv.OrganizationResourceProvider; import ca.uhn.test.jpasrv.PatientResourceProvider; diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component index 5e7d71c6700..af22db5d6d1 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component +++ b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component @@ -12,7 +12,7 @@ uses - + consumes diff --git a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java index b52a76cb118..28bab14fb65 100644 --- a/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java +++ b/hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/Controller.java @@ -56,7 +56,7 @@ import ca.uhn.fhir.rest.client.IGenericClient; import ca.uhn.fhir.rest.gclient.ICreateTyped; import ca.uhn.fhir.rest.gclient.IQuery; import ca.uhn.fhir.rest.gclient.IUntypedQuery; -import ca.uhn.fhir.rest.gclient.StringParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; import ca.uhn.fhir.rest.server.Constants; import ca.uhn.fhir.rest.server.EncodingEnum; import ca.uhn.fhir.to.model.HomeRequest; @@ -907,7 +907,7 @@ public class Controller { theClientCodeJsonWriter.write("value", nextValue); theClientCodeJsonWriter.writeEnd(); - theQuery.where(new StringParam(nextName + nextQualifier).matches().value(nextValue)); + theQuery.where(new StringClientParam(nextName + nextQualifier).matches().value(nextValue)); } diff --git a/hapi-tinder-plugin/src/main/resources/vm/resource.vm b/hapi-tinder-plugin/src/main/resources/vm/resource.vm index d39dc0d5634..73c1fcc4d02 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/resource.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/resource.vm @@ -60,7 +60,7 @@ public class ${className} extends BaseResource implements IResource { * Path: ${param.path}
*

*/ - public static final ${param.typeCapitalized}Param ${param.fluentConstantName} = new ${param.typeCapitalized}Param(${param.constantName}); + public static final ${param.typeCapitalized}ClientParam ${param.fluentConstantName} = new ${param.typeCapitalized}ClientParam(${param.constantName}); #if( ${param.typeCapitalized} == 'Reference' ) #foreach ( $include in $param.paths )