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

Move BoundCodeableConceptDt back to where it originally was for DSTU1 

resources
This commit is contained in:
James Agnew 2014-10-29 16:08:07 -04:00
parent d2e6fc2253
commit da6a5d5a24
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/composite/BoundCodeableConceptDt.java → hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java
View File

@ -1,4 +1,4 @@
package ca.uhn.fhir.model.dstu.composite; package ca.uhn.fhir.model.primitive;
/* /*
* #%L * #%L
@ -29,6 +29,8 @@ import java.util.Set;
import ca.uhn.fhir.model.api.IBoundCodeableConcept; import ca.uhn.fhir.model.api.IBoundCodeableConcept;
import ca.uhn.fhir.model.api.IValueSetEnumBinder; import ca.uhn.fhir.model.api.IValueSetEnumBinder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.DatatypeDef;
import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
@DatatypeDef(name = "CodeableConcept", isSpecialization = true) @DatatypeDef(name = "CodeableConcept", isSpecialization = true)
public class BoundCodeableConceptDt<T extends Enum<?>> extends CodeableConceptDt implements IBoundCodeableConcept { public class BoundCodeableConceptDt<T extends Enum<?>> extends CodeableConceptDt implements IBoundCodeableConcept {

8
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/composite/BoundCodeableConceptDt.java → hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/composite/BoundCodeableConceptDt_.java
View File

@ -30,21 +30,21 @@ import ca.uhn.fhir.model.api.IValueSetEnumBinder;
import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.DatatypeDef;
@DatatypeDef(name = "CodeableConcept", isSpecialization = true) @DatatypeDef(name = "CodeableConcept", isSpecialization = true)
public class BoundCodeableConceptDt<T extends Enum<?>> extends CodeableConceptDt { public class BoundCodeableConceptDt_<T extends Enum<?>> extends CodeableConceptDt {
private IValueSetEnumBinder<T> myBinder; private IValueSetEnumBinder<T> myBinder;
/** /**
* Constructor * Constructor
*/ */
public BoundCodeableConceptDt(IValueSetEnumBinder<T> theBinder) { public BoundCodeableConceptDt_(IValueSetEnumBinder<T> theBinder) {
myBinder = theBinder; myBinder = theBinder;
} }
/** /**
* Constructor * Constructor
*/ */
public BoundCodeableConceptDt(IValueSetEnumBinder<T> theBinder, T theValue) { public BoundCodeableConceptDt_(IValueSetEnumBinder<T> theBinder, T theValue) {
myBinder = theBinder; myBinder = theBinder;
setValueAsEnum(theValue); setValueAsEnum(theValue);
} }
@ -52,7 +52,7 @@ public class BoundCodeableConceptDt<T extends Enum<?>> extends CodeableConceptDt
/** /**
* Constructor * Constructor
*/ */
public BoundCodeableConceptDt(IValueSetEnumBinder<T> theBinder, Collection<T> theValues) { public BoundCodeableConceptDt_(IValueSetEnumBinder<T> theBinder, Collection<T> theValues) {
myBinder = theBinder; myBinder = theBinder;
setValueAsEnum(theValues); setValueAsEnum(theValues);
} }

20
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java
View File

@ -53,7 +53,7 @@ import ca.uhn.fhir.model.api.annotation.Description;
import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
import ca.uhn.fhir.model.base.resource.BaseConformance; import ca.uhn.fhir.model.base.resource.BaseConformance;
import ca.uhn.fhir.model.dstu.composite.BoundCodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.BoundCodeableConceptDt_;
import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt;
import ca.uhn.fhir.model.dstu.composite.CodingDt; import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.model.dstu.composite.ContactDt; import ca.uhn.fhir.model.dstu.composite.ContactDt;
@ -2301,7 +2301,7 @@ public class Conformance extends BaseConformance implements IResource {
shortDefinition="OAuth | OAuth2 | NTLM | Basic | Kerberos", shortDefinition="OAuth | OAuth2 | NTLM | Basic | Kerberos",
formalDefinition="Types of security services are supported/required by the system" formalDefinition="Types of security services are supported/required by the system"
) )
private java.util.List<BoundCodeableConceptDt<RestfulSecurityServiceEnum>> myService; private java.util.List<BoundCodeableConceptDt_<RestfulSecurityServiceEnum>> myService;
@Child(name="description", type=StringDt.class, order=2, min=0, max=1) @Child(name="description", type=StringDt.class, order=2, min=0, max=1)
@Description( @Description(
@ -2382,9 +2382,9 @@ public class Conformance extends BaseConformance implements IResource {
* Types of security services are supported/required by the system * Types of security services are supported/required by the system
* </p> * </p>
*/ */
public java.util.List<BoundCodeableConceptDt<RestfulSecurityServiceEnum>> getService() { public java.util.List<BoundCodeableConceptDt_<RestfulSecurityServiceEnum>> getService() {
if (myService == null) { if (myService == null) {
myService = new java.util.ArrayList<BoundCodeableConceptDt<RestfulSecurityServiceEnum>>(); myService = new java.util.ArrayList<BoundCodeableConceptDt_<RestfulSecurityServiceEnum>>();
} }
return myService; return myService;
} }
@ -2397,7 +2397,7 @@ public class Conformance extends BaseConformance implements IResource {
* Types of security services are supported/required by the system * Types of security services are supported/required by the system
* </p> * </p>
*/ */
public RestSecurity setService(java.util.List<BoundCodeableConceptDt<RestfulSecurityServiceEnum>> theValue) { public RestSecurity setService(java.util.List<BoundCodeableConceptDt_<RestfulSecurityServiceEnum>> theValue) {
myService = theValue; myService = theValue;
return this; return this;
} }
@ -2413,8 +2413,8 @@ public class Conformance extends BaseConformance implements IResource {
* Types of security services are supported/required by the system * Types of security services are supported/required by the system
* </p> * </p>
*/ */
public BoundCodeableConceptDt<RestfulSecurityServiceEnum> addService(RestfulSecurityServiceEnum theValue) { public BoundCodeableConceptDt_<RestfulSecurityServiceEnum> addService(RestfulSecurityServiceEnum theValue) {
BoundCodeableConceptDt<RestfulSecurityServiceEnum> retVal = new BoundCodeableConceptDt<RestfulSecurityServiceEnum>(RestfulSecurityServiceEnum.VALUESET_BINDER, theValue); BoundCodeableConceptDt_<RestfulSecurityServiceEnum> retVal = new BoundCodeableConceptDt_<RestfulSecurityServiceEnum>(RestfulSecurityServiceEnum.VALUESET_BINDER, theValue);
getService().add(retVal); getService().add(retVal);
return retVal; return retVal;
} }
@ -2428,7 +2428,7 @@ public class Conformance extends BaseConformance implements IResource {
* Types of security services are supported/required by the system * Types of security services are supported/required by the system
* </p> * </p>
*/ */
public BoundCodeableConceptDt<RestfulSecurityServiceEnum> getServiceFirstRep() { public BoundCodeableConceptDt_<RestfulSecurityServiceEnum> getServiceFirstRep() {
if (getService().size() == 0) { if (getService().size() == 0) {
addService(); addService();
} }
@ -2443,8 +2443,8 @@ public class Conformance extends BaseConformance implements IResource {
* Types of security services are supported/required by the system * Types of security services are supported/required by the system
* </p> * </p>
*/ */
public BoundCodeableConceptDt<RestfulSecurityServiceEnum> addService() { public BoundCodeableConceptDt_<RestfulSecurityServiceEnum> addService() {
BoundCodeableConceptDt<RestfulSecurityServiceEnum> retVal = new BoundCodeableConceptDt<RestfulSecurityServiceEnum>(RestfulSecurityServiceEnum.VALUESET_BINDER); BoundCodeableConceptDt_<RestfulSecurityServiceEnum> retVal = new BoundCodeableConceptDt_<RestfulSecurityServiceEnum>(RestfulSecurityServiceEnum.VALUESET_BINDER);
getService().add(retVal); getService().add(retVal);
return retVal; return retVal;
} }

5
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java
View File

@ -255,6 +255,11 @@ public abstract class BaseStructureParser {
if (file.exists()) { if (file.exists()) {
return myPackageBase + ".composite." + theNextType; return myPackageBase + ".composite." + theNextType;
} }
fileName = myBaseDir + "/src/main/java/ca/uhn/fhir/model/primitive/" + theNextType + ".java";
file = new File(fileName);
if (file.exists()) {
return "ca.uhn.fhir.model.primitive." + theNextType;
}
throw new MojoFailureException("Unknown type: " + theNextType + " - Have locally defined names: " + new TreeSet<String>(myLocallyDefinedClassNames.keySet())); throw new MojoFailureException("Unknown type: " + theNextType + " - Have locally defined names: " + new TreeSet<String>(myLocallyDefinedClassNames.keySet()));
} }
} }