Add NAACCR XML IDs to schema inputs and outputs

imsweb · Jul 1, 2020 · f7b631d · f7b631d
1 parent 5e3fcab
commit f7b631d
Show file tree

Hide file tree

Showing 122 changed files with 3,684 additions and 231 deletions.
diff --git a/README.md b/README.md
@@ -30,14 +30,14 @@ Download [the latest JAR][1] or grab via Maven:
 <dependency>
     <groupId>com.imsweb</groupId>
     <artifactId>staging-algorithm-eod-public</artifactId>
-    <version>2.0</version>
+    <version>2.0.1</version>
 </dependency>
 ```
 
 or via Gradle:
 
 ```groovy
-compile 'com.imsweb.com:staging-algorithm-eod-public:2.0'
+compile 'com.imsweb.com:staging-algorithm-eod-public:2.0.1'
 ```
 
 ## Usage

diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,17 @@
 plugins {
     id 'java-library'
     id 'checkstyle'
-    id "com.github.spotbugs" version "4.3.0"
+    id "com.github.spotbugs" version "4.4.4"
     id 'maven-publish'
     id 'signing'
     id "io.codearte.nexus-staging" version "0.21.2"  // logs into Sonotype OSS and does a "Close" and "Release"
-    id 'com.adarshr.test-logger' version '2.0.0'
+    id 'com.adarshr.test-logger' version '2.1.0'
     id "com.github.ben-manes.versions" version "0.28.0"
     id "org.owasp.dependencycheck" version "5.3.2.1"
 }
 
 group = 'com.imsweb'
-version = '2.1-SNAPSHOT'
+version = '2.0.1'
 description = 'EOD algorithm for the java-staging-client'
 
 tasks.withType(JavaCompile) {
@@ -32,9 +32,9 @@ repositories {
 }
 
 dependencies {
-    spotbugs 'com.github.spotbugs:spotbugs:4.0.4'
+    spotbugs 'com.github.spotbugs:spotbugs:4.0.6'
 
-    api 'com.imsweb:staging-client-java:4.7'
+    api 'com.imsweb:staging-client-java:4.8'
 
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.assertj:assertj-core:3.16.1'
@@ -159,6 +159,6 @@ nexusStaging {
 }
 
 wrapper {
-    gradleVersion = '6.5'
+    gradleVersion = '6.5.1'
     distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/algorithms/eod_public/2.0/schemas/adnexa_uterine_other.json b/src/main/resources/algorithms/eod_public/2.0/schemas/adnexa_uterine_other.json
@@ -10,91 +10,105 @@
     "key" : "year_dx",
     "name" : "Year of Diagnosis",
     "naaccr_item" : 390,
+    "naaccr_xml_id" : "dateOfDiagnosis",
     "table" : "year_dx_validation",
     "used_for_staging" : false
   }, {
     "key" : "site",
     "name" : "Primary Site",
     "naaccr_item" : 400,
+    "naaccr_xml_id" : "primarySite",
     "table" : "primary_site",
     "used_for_staging" : true
   }, {
     "key" : "hist",
     "name" : "Histology",
     "naaccr_item" : 522,
+    "naaccr_xml_id" : "histologicTypeIcdO3",
     "table" : "histology",
     "used_for_staging" : true
   }, {
     "key" : "size_clin",
     "name" : "Tumor Size Clinical",
     "naaccr_item" : 752,
+    "naaccr_xml_id" : "tumorSizeClinical",
     "table" : "tumor_size_clinical_60979",
     "used_for_staging" : false
   }, {
     "key" : "size_path",
     "name" : "Tumor Size Pathological",
     "naaccr_item" : 754,
+    "naaccr_xml_id" : "tumorSizePathologic",
     "table" : "tumor_size_pathological_25597",
     "used_for_staging" : false
   }, {
     "key" : "size_summary",
     "name" : "Tumor Size Summary",
     "naaccr_item" : 756,
+    "naaccr_xml_id" : "tumorSizeSummary",
     "default" : "999",
     "table" : "tumor_size_summary_63115",
     "used_for_staging" : false
   }, {
     "key" : "nodes_pos",
     "name" : "Regional Nodes Positive",
     "naaccr_item" : 820,
+    "naaccr_xml_id" : "regionalNodesPositive",
     "default" : "99",
     "table" : "nodes_pos_fpa",
     "used_for_staging" : false
   }, {
     "key" : "nodes_exam",
     "name" : "Regional Nodes Examined",
     "naaccr_item" : 830,
+    "naaccr_xml_id" : "regionalNodesExamined",
     "default" : "99",
     "table" : "nodes_exam_76029",
     "used_for_staging" : false
   }, {
     "key" : "lvi",
     "name" : "LVI",
     "naaccr_item" : 1182,
+    "naaccr_xml_id" : "lymphVascularInvasion",
     "default" : "8",
     "table" : "lvi_dna_56663",
     "used_for_staging" : false
   }, {
     "key" : "eod_primary_tumor",
     "name" : "EOD Primary Tumor",
     "naaccr_item" : 772,
+    "naaccr_xml_id" : "eodPrimaryTumor",
     "default" : "999",
     "table" : "extension_bcn",
     "used_for_staging" : true
   }, {
     "key" : "eod_regional_nodes",
     "name" : "EOD Regional Nodes",
     "naaccr_item" : 774,
+    "naaccr_xml_id" : "eodRegionalNodes",
     "default" : "999",
     "table" : "nodes_dcc",
     "used_for_staging" : true
   }, {
     "key" : "eod_mets",
     "name" : "EOD Mets",
     "naaccr_item" : 776,
+    "naaccr_xml_id" : "eodMets",
     "default" : "00",
     "table" : "seer_mets_48348",
     "used_for_staging" : true
   }, {
     "key" : "ss2018",
     "name" : "SS2018",
     "naaccr_item" : 764,
+    "naaccr_xml_id" : "summaryStage2018",
     "table" : "adnexa_uterine_other_97891",
     "used_for_staging" : false
   }, {
     "key" : "grade_clin",
     "name" : "Grade Clinical",
     "naaccr_item" : 3843,
+    "naaccr_xml_id" : "gradeClinical",
     "default" : "9",
     "table" : "grade_clinical_standard_non_ajcc_32473",
     "used_for_staging" : false,
@@ -103,6 +117,7 @@
     "key" : "grade_path",
     "name" : "Grade Pathological",
     "naaccr_item" : 3844,
+    "naaccr_xml_id" : "gradePathological",
     "default" : "9",
     "table" : "grade_pathological_standard_non_ajcc_5627",
     "used_for_staging" : false,
@@ -118,6 +133,7 @@
     "key" : "grade_post_therapy_path",
     "name" : "Grade Post Therapy Path (yp)",
     "naaccr_item" : 3845,
+    "naaccr_xml_id" : "gradePostTherapy",
     "table" : "grade_post_therapy_path_75348",
     "used_for_staging" : false,
     "metadata" : [ "NPCR_REQUIRED", "COC_REQUIRED", "SSDI", "CCCR_REQUIRED", "SEER_REQUIRED" ]
@@ -126,16 +142,19 @@
     "key" : "naaccr_schema_id",
     "name" : "Schema ID",
     "naaccr_item" : 3800,
+    "naaccr_xml_id" : "schemaId",
     "default" : "00558"
   }, {
     "key" : "ajcc_id",
     "name" : "AJCC ID",
     "naaccr_item" : 995,
+    "naaccr_xml_id" : "ajccId",
     "default" : "XX"
   }, {
     "key" : "ajcc_version_number",
     "name" : "AJCC Version Number",
     "naaccr_item" : 1060,
+    "naaccr_xml_id" : "tnmEditionNumber",
     "default" : "88"
   }, {
     "key" : "derived_version",
@@ -145,26 +164,31 @@
     "key" : "eod_2018_t",
     "name" : "Derived EOD 2018 T",
     "naaccr_item" : 785,
+    "naaccr_xml_id" : "derivedEod2018T",
     "default" : "88"
   }, {
     "key" : "eod_2018_n",
     "name" : "Derived EOD 2018 N",
     "naaccr_item" : 815,
+    "naaccr_xml_id" : "derivedEod2018N",
     "default" : "88"
   }, {
     "key" : "eod_2018_m",
     "name" : "Derived EOD 2018 M",
     "naaccr_item" : 795,
+    "naaccr_xml_id" : "derivedEod2018M",
     "default" : "88"
   }, {
     "key" : "eod_2018_stage_group",
     "name" : "Derived EOD 2018 Stage Group",
     "naaccr_item" : 818,
+    "naaccr_xml_id" : "derivedEod2018StageGroup",
     "default" : "88"
   }, {
     "key" : "ss2018_derived",
     "name" : "Derived Summary Stage 2018",
     "naaccr_item" : 762,
+    "naaccr_xml_id" : "derivedSummaryStage2018",
     "default" : "9"
   } ],
   "mappings" : [ {
@@ -190,5 +214,5 @@
   } ],
   "involved_tables" : [ "seer_mets_48348", "nodes_dcc", "grade_clinical_standard_non_ajcc_32473", "grade_pathological_standard_non_ajcc_5627", "adnexa_uterine_other_97891", "nodes_pos_fpa", "tumor_size_pathological_25597", "tumor_size_clinical_60979", "grade_post_therapy_clin_69737", "primary_site", "histology", "nodes_exam_76029", "grade_post_therapy_path_75348", "schema_selection_adnexa_uterine_other", "year_dx_validation", "summary_stage_rpa", "lvi_dna_56663", "tumor_size_summary_63115", "extension_bcn" ],
   "on_invalid_input" : "CONTINUE",
-  "last_modified" : "2020-06-04T17:09:02.281Z"
+  "last_modified" : "2020-06-30T19:49:17.595Z"
 }