fix: Include DynamicModel get value by key

merative · Mar 24, 2022 · 8be35b1 · 8be35b1
1 parent 48d4fad
commit 8be35b1
Show file tree

Hide file tree

Showing 58 changed files with 1,357 additions and 86 deletions.
diff --git a/modules/annotator-for-clinical-data/.classpath b/modules/annotator-for-clinical-data/.classpath
@@ -10,6 +10,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@@ -20,18 +21,24 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/modules/annotator-for-clinical-data/.gitignore b/modules/annotator-for-clinical-data/.gitignore
@@ -0,0 +1 @@
+/.apt_generated/
diff --git a/modules/annotator-for-clinical-data/.project b/modules/annotator-for-clinical-data/.project
@@ -16,17 +16,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

diff --git a/modules/annotator-for-clinical-data/.settings/org.eclipse.core.resources.prefs b/modules/annotator-for-clinical-data/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/modules/annotator-for-clinical-data/.settings/org.eclipse.jdt.core.prefs b/modules/annotator-for-clinical-data/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

diff --git a/...-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/AllergyMedicationInd.java b/...-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/AllergyMedicationInd.java
@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
 import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
@@ -133,5 +134,26 @@ public Boolean isHypothetical() {
   public List<MedicationAnnotation> getMedication() {
 	  return this.medication;
   }
+
+  /**
+   * Returns the value from AllergyMedicationInd annotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = AllergyMedicationInd.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }
 
diff --git a/...otator-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/Annotation.java b/...otator-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/Annotation.java
@@ -12,6 +12,8 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
+
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import com.ibm.cloud.sdk.core.service.model.DynamicModel;
@@ -90,5 +92,26 @@ public Long getEnd() {
   public String getCoveredText() {
     return this.coveredText;
   }
+
+  /**
+   * Returns the value from Annotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = Annotation.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }
 
diff --git a/...-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/AssistanceAnnotation.java b/...-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/AssistanceAnnotation.java
@@ -12,6 +12,8 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
+
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import com.ibm.cloud.sdk.core.service.model.DynamicModel;
@@ -175,4 +177,25 @@ public String getSectionNormalizedName() {
   public String getSectionSurfaceForm() {
     return this.sectionSurfaceForm;
   }
+
+  /**
+   * Returns the value from AssistanceAnnotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = AssistanceAnnotation.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }
diff --git a/...nical-data/src/main/java/com/ibm/watson/health/acd/v1/model/AttributeValueAnnotation.java b/...nical-data/src/main/java/com/ibm/watson/health/acd/v1/model/AttributeValueAnnotation.java
@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -717,4 +718,24 @@ public void setEvidenceSpans(final List<Reference> evidenceSpans) {
     this.evidenceSpans = evidenceSpans;
   }
 
+  /**
+   * Returns the value from AttributeValueAnnotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = AttributeValueAnnotation.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }
diff --git a/...r-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/CancerDiagnosis.java b/...r-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/CancerDiagnosis.java
@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -214,4 +215,25 @@ public CustomCollection getCancer(int index) {
     CustomCollection customCollection = new CustomCollection();
     return customCollection.convertToCustomCollection(listCancer.get(index));
   }
+
+  /**
+   * Returns the value from CancerDiagnosis annotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = CancerDiagnosis.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }
diff --git a/...annotator-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/Concept.java b/...annotator-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/Concept.java
@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
 import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
@@ -625,4 +626,24 @@ public void setValueIndex(final Integer valueIndex) {
     this.valueIndex = valueIndex;
   }
 
+  /**
+   * Returns the value from Concept annotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = Concept.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }
diff --git a/...ator-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/ConceptValue.java b/...ator-for-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/ConceptValue.java
@@ -12,6 +12,7 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -291,4 +292,25 @@ public String getRangeEnd() {
     return this.rangeEnd;
   }
 
+  /**
+   * Returns the value from ConceptValue annotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = ConceptValue.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
+
 }
diff --git a/...cal-data/src/main/java/com/ibm/watson/health/acd/v1/model/EjectionFractionAnnotation.java b/...cal-data/src/main/java/com/ibm/watson/health/acd/v1/model/EjectionFractionAnnotation.java
@@ -12,6 +12,8 @@
  */
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
+
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import com.ibm.cloud.sdk.core.service.model.DynamicModel;
@@ -242,4 +244,24 @@ public String getSectionSurfaceForm() {
     return this.sectionSurfaceForm;
   }
 
+  /**
+   * Returns the value from EjectionFractionAnnotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = EjectionFractionAnnotation.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }
diff --git a/...r-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/InsightModelAlcohol.java b/...r-clinical-data/src/main/java/com/ibm/watson/health/acd/v1/model/InsightModelAlcohol.java
@@ -13,6 +13,8 @@
 
 package com.ibm.watson.health.acd.v1.model;
 
+import java.lang.reflect.Field;
+
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import com.ibm.cloud.sdk.core.service.model.DynamicModel;
@@ -93,4 +95,24 @@ public Float getTreatmentScore() {
 	  return this.treatmentScore;
   }
 
+  /**
+   * Returns the value from InsightModelAlcohol annotation by specified key.
+   *
+   * @param key the name of the field to get
+   */
+  @Override
+  public Object get(String key) {
+	  Object value = super.get(key);
+	  if (value == null) {
+		  try {
+			  Field field = InsightModelAlcohol.class.getDeclaredField(key);
+			  value = field.get(this);
+		  } catch (NoSuchFieldException e) {
+			  return null;
+		  } catch (Exception e1) {
+			  e1.printStackTrace();
+		  }
+	  }
+	  return value;
+  }
 }