Merge pull request #2 from 3d-system-navigation/geia-serialization

Implement GEIA deserialization using jaxb.

build.gradle

@@ -46,6 +46,9 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
+    implementation 'javax.xml.bind:jaxb-api:2.3.1'
+    implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.2'
+
     implementation 'org.springframework.boot:spring-boot-starter-web'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
@@ -54,7 +57,7 @@ dependencies {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
 
-    implementation platform('com.amazonaws:aws-java-sdk-bom:1.11.734')
+    implementation platform('com.amazonaws:aws-java-sdk-bom:1.11.749')
     implementation 'com.amazonaws:aws-java-sdk-s3'
 
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/AA.groovy

@@ -0,0 +1,27 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+import javax.xml.bind.annotation.XmlElement
+
+@ToString
+@EqualsAndHashCode
+class AA {
+
+    @XmlElement(name = "end_item_acronym_code")
+    String endItemAcronymCode
+
+    @XmlElement(name = "logistics_support_analysis_control_number")
+    String lcn
+
+    @XmlElement(name = "alternate_logistics_support_analysis_control_number_code")
+    String alternateLcn
+
+    @XmlElement(name = "logistics_support_analysis_control_number_type")
+    String lcnType
+
+    @XmlElement(name = "service_designator_code")
+    String serviceDesignatorCode
+
+}

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/AB.groovy

@@ -0,0 +1,45 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+import javax.xml.bind.annotation.XmlElement
+
+@ToString
+@EqualsAndHashCode
+class AB {
+
+    @XmlElement(name = "end_item_acronym_code")
+    String endItemAcronymCode
+
+    @XmlElement(name = "logistics_support_analysis_control_number")
+    String lcn
+
+    @XmlElement(name = "alternate_logistics_support_analysis_control_number_code")
+    String alternateLcn
+
+    @XmlElement(name = "logistics_support_analysis_control_number_type")
+    String lcnType
+
+    @XmlElement(name = "service_designator_code")
+    String serviceDesignatorCode
+
+    @XmlElement(name = "operational_requirement_indicator")
+    String operationalRequirementIndicator
+
+    @XmlElement(name = "annual_number_of_missions")
+    Integer annualNumberOfMissions
+
+    @XmlElement(name = "annual_operating_days")
+    Integer annualOperatingDays
+
+    @XmlElement(name = "annual_operating_time")
+    Integer annualOperatingTime
+
+    @XmlElement(name = "mean_mission_duration")
+    BigDecimal meanMissionDuration
+
+    @XmlElement(name = "mean_mission_duration_measurement_base")
+    String meanMissionDurationMeasurementBase
+
+}

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/AG.groovy

@@ -0,0 +1,36 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+import javax.xml.bind.annotation.XmlElement
+
+@ToString
+@EqualsAndHashCode
+class AG {
+
+    @XmlElement(name = "end_item_acronym_code")
+    String endItemAcronymCode
+
+    @XmlElement(name = "logistics_support_analysis_control_number")
+    String lcn
+
+    @XmlElement(name = "alternate_logistics_support_analysis_control_number_code")
+    String alternateLcn
+
+    @XmlElement(name = "logistics_support_analysis_control_number_type")
+    String lcnType
+
+    @XmlElement(name = "annual_operating_requirement_measurement_base")
+    String annualOperatingRequirementMeasurementBase
+
+    @XmlElement(name = "annual_operating_requirement")
+    Integer annualOperatingRequirement
+
+    @XmlElement(name = "reliability_operational_requirements_indicator")
+    String reliabilityOperationalRequirementsIndicator
+
+    @XmlElement(name = "required_mean_time_between_removals")
+    BigDecimal requiredMeanTimeBetweenRemovals
+
+}

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/CA.groovy

@@ -0,0 +1,48 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+import javax.xml.bind.annotation.XmlElement
+
+@ToString
+@EqualsAndHashCode
+class CA {
+
+    @XmlElement(name = "end_item_acronym_code")
+    String endItemAcronymCode
+
+    @XmlElement(name = "logistics_support_analysis_control_number")
+    String lcn
+
+    @XmlElement(name = "alternate_logistics_support_analysis_control_number_code")
+    String alternateLcn
+
+    @XmlElement(name = "logistics_support_analysis_control_number_type")
+    String lcnType
+
+    @XmlElement(name = "task_code")
+    String taskCode
+
+    @XmlElement(name = "annual_operating_requirement_logistics_support_analysis_control_number")
+    String annualOperatingRequirementLcn
+
+    @XmlElement(name = "annual_operating_requirement_alternate_logistics_support_analysis_control_number_code")
+    String annualOperatingRequirementAlternateLcnCode
+
+    @XmlElement(name = "annual_operating_requirement_logistics_support_analysis_control_number_type")
+    String annualOperatingRequirementLcnType
+
+    @XmlElement(name = "task_annual_operating_requirement_measurement_base")
+    String taskAnnualOperatingRequirementMeasurementBase
+
+    @XmlElement(name = "task_identification")
+    String taskIdentification
+
+    @XmlElement(name = "task_frequency")
+    BigDecimal taskFrequency
+
+    @XmlElement(name = "preventive_maintenance_checks_and_services_indicator_code")
+    String preventiveMaintenanceChecksAndServicesIndicatorCode
+
+}

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/CI.groovy

@@ -0,0 +1,42 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+import javax.xml.bind.annotation.XmlElement
+
+@ToString
+@EqualsAndHashCode
+class CI {
+
+    @XmlElement(name = "end_item_acronym_code")
+    String endItemAcronymCode
+
+    @XmlElement(name = "logistics_support_analysis_control_number")
+    String lcn
+
+    @XmlElement(name = "alternate_logistics_support_analysis_control_number_code")
+    String alternateLcn
+
+    @XmlElement(name = "logistics_support_analysis_control_number_type")
+    String lcnType
+
+    @XmlElement(name = "task_provision_task_code")
+    String taskProvisionTaskCode
+
+    @XmlElement(name = "task_provision_commercial_and_government_entity_code")
+    String taskProvisionCageCode
+
+    @XmlElement(name = "task_provision_reference_number")
+    String taskProvisionReferenceNumber
+
+    @XmlElement(name = "task_provision_logistics_support_analysis_control_number")
+    String taskProvisionLcn
+
+    @XmlElement(name = "task_provision_alternate_logistics_support_analysis_control_number_code")
+    String taskProvisionAlternateLcnCode
+
+    @XmlElement(name = "task_provision_logistics_support_analysis_control_number_type")
+    String taskProvisionLcnType
+
+}

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/GA.groovy

@@ -0,0 +1,18 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+import javax.xml.bind.annotation.XmlElement
+
+@ToString
+@EqualsAndHashCode
+class GA {
+
+    @XmlElement(name = "skill_specialty_code")
+    String skillSpecialityCode
+
+    @XmlElement(name = "skill_level_code")
+    String skillLevelCode
+
+}

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/GeiaEntity.groovy

@@ -0,0 +1,5 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+interface GeiaEntity {
+
+}

src/main/groovy/com/lmco/spectrum/systemnavigation3d/domain/dto/HA.groovy

@@ -0,0 +1,21 @@
+package com.lmco.spectrum.systemnavigation3d.domain.dto
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+import javax.xml.bind.annotation.XmlElement
+
+@ToString
+@EqualsAndHashCode
+class HA {
+
+    @XmlElement(name = "commercial_and_government_entity_code")
+    String cageCode
+
+    @XmlElement(name = "reference_number")
+    String referenceNumber
+
+    @XmlElement(name = "item_name")
+    String itemName
+
+}