Annotation model fixreqs (#4232)

* Tightened tests for optional components of model

The schema definitions did not say that an item was required
so there were false positives in some cases - but only on optional
components of the model.

* Incorporated updates to address false positives

This essentially involves adding required entries to many of the
optional schema components.

* Tightened tests for optional components of model

The schema definitions did not say that an item was required
so there were false positives in some cases - but only on optional
components of the model.

* Remove Composite, List, Independent tests

Consistent with CR3 changes

annotation-model/annotations/3.2-targetObjectsRecognized.json

@@ -18,5 +18,6 @@
       }
     ]
     }
-  }
+  },
+  "required": [ "target" ]
 }

annotation-model/annotations/annotationOptionals.test

@@ -39,11 +39,7 @@
     "annotations/bodiesTargets/3.2.4-bodyETB.json",
     "annotations/bodiesTargets/3.2.4-bodyETBTypeTextualBody.json",
     "annotations/bodiesTargets/3.2.4-bodyETBTypeText.json",
-    "annotations/bodiesTargets/3.2.7-bodyChoiceSet.json",
     "annotations/bodiesTargets/3.2.7-bodyChoice.json",
-    "annotations/bodiesTargets/3.2.8-bodyList.json",
-    "annotations/bodiesTargets/3.2.8-bodyComposite.json",
-    "annotations/bodiesTargets/3.2.8-bodyIndependents.json",
     "annotations/bodiesTargets/3.2.1-targSingleFormat.json",
     "annotations/bodiesTargets/3.2.1-targSingleLanguage.json",
     "annotations/bodiesTargets/3.3.1-targSingleCreator.json",
@@ -61,11 +57,7 @@
     "annotations/bodiesTargets/3.3.7-targCanonical.json",
     "annotations/bodiesTargets/3.3.7-targVia.json",
     "annotations/bodiesTargets/3.2.1-targEWR.json",
-    "annotations/bodiesTargets/3.2.7-targChoiceSet.json",
     "annotations/bodiesTargets/3.2.7-targChoice.json",
-    "annotations/bodiesTargets/3.2.8-targList.json",
-    "annotations/bodiesTargets/3.2.8-targComposite.json",
-    "annotations/bodiesTargets/3.2.8-targIndependents.json",
     "annotations/bodiesTargets/4-bodySpecificResource.json",
     "annotations/bodiesTargets/4-targSpecificResource.json",
     "annotations/specificResource/4.3.3-refinedBy.json",

annotation-model/annotations/bodiesTargets/3.2.1-targEWR.json

@@ -21,5 +21,6 @@
                       { "not": { "items": { "not": { "$ref": "bodyTarget.json#/definitions/itemEwrDetected" } } } }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.1-targFormat.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.1-targLanguage.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.1-targProcessingLanguage.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.1-targSingleFormat.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.1-targSingleLanguage.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.1-targTextDirection.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.2-targType.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+    "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.2.7-targChoice.json

@@ -24,5 +24,6 @@
                       }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.3.1-targCreated.json

@@ -34,5 +34,6 @@
 
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.3.1-targCreator.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.3.1-targModified.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }

annotation-model/annotations/bodiesTargets/3.3.1-targSingleCreator.json

@@ -33,5 +33,6 @@
                        }
                      ]
          }
-     }
+     },
+     "required": [ "target" ]
 }