From 082b9cfc4be8979ecd102bf70d3e66a134036153 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 4 Mar 2015 13:50:58 -0500
Subject: [PATCH] Performance enhancements

---
 hapi-fhir-android/dependency-reduced-pom.xml  | 28 -------------------
 .../ca/uhn/fhir/context/ModelScanner.java     | 11 +++++++-
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/hapi-fhir-android/dependency-reduced-pom.xml b/hapi-fhir-android/dependency-reduced-pom.xml
index 0246aa284a5..44b2146062e 100644
--- a/hapi-fhir-android/dependency-reduced-pom.xml
+++ b/hapi-fhir-android/dependency-reduced-pom.xml
@@ -87,34 +87,6 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>DIST</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>${maven_assembly_plugin_version}</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <attach>false</attach>
-                  <descriptors>
-                    <descriptor>${project.basedir}/src/assembly/hapi-fhir-all.xml</descriptor>
-                    <descriptor>${project.basedir}/src/assembly/hapi-fhir-jpaserver-example.xml</descriptor>
-                  </descriptors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
   <dependencies>
     <dependency>
       <groupId>com.phloc</groupId>
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
index f5b674d3754..0b5cd320ee0 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
@@ -226,9 +226,16 @@ class ModelScanner {
 	 * all of the annotation processing code this method just creates an interface Proxy to simulate the HAPI
 	 * annotations if the HL7.org ones are found instead.
 	 */
-	@SuppressWarnings("unchecked")
 	private <T extends Annotation> T pullAnnotation(AnnotatedElement theTarget, Class<T> theAnnotationType) {
+		
 		T retVal = theTarget.getAnnotation(theAnnotationType);
+		if (true) {
+			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");
@@ -257,6 +264,8 @@ class ModelScanner {
 				}
 			}
 		}
+		*/
+		
 		return retVal;
 	}