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

Work on HL7 structs

This commit is contained in:
jamesagnew 2015-04-10 08:02:05 -04:00
parent 8c873ef023
commit b6f2b57ed9
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
View File

@ -27,8 +27,11 @@ import java.io.InputStream;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement; import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Proxy;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -225,31 +228,39 @@ class ModelScanner {
private <T extends Annotation> T pullAnnotation(AnnotatedElement theTarget, Class<T> theAnnotationType) { private <T extends Annotation> T pullAnnotation(AnnotatedElement theTarget, Class<T> theAnnotationType) {
T retVal = theTarget.getAnnotation(theAnnotationType); T retVal = theTarget.getAnnotation(theAnnotationType);
if (true) { if (myContext.getVersion().getVersion().equals(FhirVersionEnum.DSTU2_HL7ORG) == false) {
return retVal; return retVal;
} }
// Below disabled for now due to performance issues if (retVal == null) {
String sourceClassName = theAnnotationType.getName();
String candidateAltClassName = sourceClassName.replace("ca.uhn.fhir.model.api.annotation", "org.hl7.fhir.instance.model.annotations");
/* if (!sourceClassName.equals(candidateAltClassName)) {
* if (retVal == null) { String sourceClassName = theAnnotationType.getName(); String candidateAltClassName = try {
* sourceClassName.replace("ca.uhn.fhir.model.api.annotation", "org.hl7.fhir.instance.model.annotations"); final Class<? extends Annotation> altAnnotationClass = (Class<? extends Annotation>) Class.forName(candidateAltClassName);
* final Annotation altAnnotation = theTarget.getAnnotation(altAnnotationClass);
* if (!sourceClassName.equals(candidateAltClassName)) { try { final Class<? extends Annotation> if (altAnnotation == null) {
* altAnnotationClass = (Class<? extends Annotation>) Class.forName(candidateAltClassName); final Annotation return null;
* altAnnotation = theTarget.getAnnotation(altAnnotationClass); if (altAnnotation == null) { return null; } }
*
* ourLog.debug("Forwarding annotation request for [{}] to class [{}]", sourceClassName, candidateAltClassName); ourLog.debug("Forwarding annotation request for [{}] to class [{}]", sourceClassName, candidateAltClassName);
*
* InvocationHandler h = new InvocationHandler() { InvocationHandler h = new InvocationHandler() {
*
* @Override public Object invoke(Object theProxy, Method theMethod, Object[] theArgs) throws Throwable { Method @Override
* altMethod = altAnnotationClass.getMethod(theMethod.getName(), theMethod.getParameterTypes()); return public Object invoke(Object theProxy, Method theMethod, Object[] theArgs) throws Throwable {
* altMethod.invoke(altAnnotation, theArgs); } }; retVal = (T) Method altMethod = altAnnotationClass.getMethod(theMethod.getName(), theMethod.getParameterTypes());
* Proxy.newProxyInstance(theAnnotationType.getClassLoader(), new Class<?>[] { theAnnotationType }, h); return altMethod.invoke(altAnnotation, theArgs);
* }
* } catch (ClassNotFoundException e) { return null; } } } };
*/ retVal = (T) Proxy.newProxyInstance(theAnnotationType.getClassLoader(), new Class<?>[] { theAnnotationType }, h);
} catch (ClassNotFoundException e) {
return null;
}
}
}
return retVal; return retVal;
} }

4
hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java
View File

@ -94,7 +94,7 @@ public class XmlParserTest {
String output = ourCtx.newXmlParser().encodeResourceToString(b); String output = ourCtx.newXmlParser().encodeResourceToString(b);
ourLog.info(output); ourLog.info(output);
assertEquals("<Binary xmlns=\"http://hl7.org/fhir\">AQIDBA==</Binary>", output); assertEquals("<Binary xmlns=\"http://hl7.org/fhir\"><content value=\"AQIDBA==\"/></Binary>", output);
} }
@ -126,7 +126,9 @@ public class XmlParserTest {
String encoded = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(b); String encoded = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(b);
ourLog.info(encoded); ourLog.info(encoded);
assertThat(encoded, not(containsString("<contained>"))); assertThat(encoded, not(containsString("<contained>")));
assertThat(encoded, stringContainsInOrder("<Organization", "<id value=\"65546\"/>", "</Organization>"));
assertThat(encoded, containsString("<reference value=\"Organization/65546\"/>")); assertThat(encoded, containsString("<reference value=\"Organization/65546\"/>"));
assertThat(encoded, stringContainsInOrder("<Patient", "<id value=\"1333\"/>", "</Patient>"));
encoded = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(patient); encoded = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(patient);
ourLog.info(encoded); ourLog.info(encoded);