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

Merge pull request #41 from wdebeau1/master 

Added codeable concept extension to ResourceWithExtensionsA to demonstra...
This commit is contained in:
James Agnew 2014-10-29 15:34:46 -04:00
parent 8f610d2c3a 812e513854
commit 23cff9fa58
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java
View File

@ -6,10 +6,8 @@ import ca.uhn.fhir.model.api.BaseIdentifiableElement;
import ca.uhn.fhir.model.api.BaseResource; import ca.uhn.fhir.model.api.BaseResource;
import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IElement;
import ca.uhn.fhir.model.api.IExtension; import ca.uhn.fhir.model.api.IExtension;
import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.*;
import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
import ca.uhn.fhir.model.api.annotation.Extension;
import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt;
import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateDt;
import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.IdDt;
@ -39,6 +37,11 @@ public class ResourceWithExtensionsA extends BaseResource {
@Extension(url = "http://foo/#f2", definedLocally=true, isModifier=true) @Extension(url = "http://foo/#f2", definedLocally=true, isModifier=true)
private StringDt myFoo2; private StringDt myFoo2;
@Child(name="baz", type = CodeableConceptDt.class, order = 4)
@Extension(url= "http://baz/#baz", definedLocally=true, isModifier=false)
@Description(shortDefinition = "Contains a codeable concept")
private CodeableConceptDt myBaz;
@Child(name = "identifier", type = IdentifierDt.class, order = 0, min = 0, max = Child.MAX_UNLIMITED) @Child(name = "identifier", type = IdentifierDt.class, order = 0, min = 0, max = Child.MAX_UNLIMITED)
private List<IdentifierDt> myIdentifier; private List<IdentifierDt> myIdentifier;
@ -58,6 +61,8 @@ public class ResourceWithExtensionsA extends BaseResource {
return myFoo2; return myFoo2;
} }
public CodeableConceptDt getBaz() { return myBaz; }
public List<IdentifierDt> getIdentifier() { public List<IdentifierDt> getIdentifier() {
return myIdentifier; return myIdentifier;
} }
@ -78,6 +83,8 @@ public class ResourceWithExtensionsA extends BaseResource {
myFoo2 = theFoo2; myFoo2 = theFoo2;
} }
public void setBaz(CodeableConceptDt myBaz) { this.myBaz = myBaz; }
public void setIdentifier(List<IdentifierDt> theValue) { public void setIdentifier(List<IdentifierDt> theValue) {
myIdentifier = theValue; myIdentifier = theValue;
} }