PODAAC-4327 - Migrate NSIDC ISO changes (#1)

* Migrate NSIDC ISO changes Migrated NSIDC ISO related changes from old repo to new, cleaned up codebase. * Fix ISO method call Make sure we call the new wrapper readIsoMetadataFile method
podaac · May 11, 2022 · a9e8bf9 · a9e8bf9
1 parent 45828f1
commit a9e8bf9
Show file tree

Hide file tree

Showing 10 changed files with 493 additions and 294 deletions.
diff --git a/src/main/java/gov/nasa/cumulus/metadata/aggregator/CMRRestClientProvider.java b/src/main/java/gov/nasa/cumulus/metadata/aggregator/CMRRestClientProvider.java
@@ -79,7 +79,7 @@ public static CMRLambdaRestClient getClient(String lambdaInputStr,
      * cloud environment setup.
      * @return
      */
-    public static CMRLambdaRestClient getECHOLambdaRestClient() {
+    public static CMRLambdaRestClient getLambdaRestClient() {
         return _elrc;
     }
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/aggregator/IsoMendsXPath.java b/src/main/java/gov/nasa/cumulus/metadata/aggregator/IsoMendsXPath.java
@@ -0,0 +1,38 @@
+package gov.nasa.cumulus.metadata.aggregator;
+
+/**
+ * Class to define ISO-MENDS XPath Expressions
+ */
+public final class IsoMendsXPath extends IsoXPath {
+    public static final String PRODUCTION_DATE_TIME = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmi:LE_ProcessStep/gmd:dateTime/gco:DateTime";
+    public static final String CREATION_DATE_TIME = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:DateTime";
+    public static final String BEGINNING_DATE_TIME = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition";
+    public static final String ENDING_DATE_TIME = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition";
+    public static final String POLYGON = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_BoundingPolygon/gmd:polygon/gml:Polygon/gml:exterior/gml:LinearRing/gml:posList";
+    public static final String WEST_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:westBoundLongitude/gco:Decimal";
+    public static final String SOUTH_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:southBoundLatitude/gco:Decimal";
+    public static final String EAST_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:eastBoundLongitude/gco:Decimal";
+    public static final String NORTH_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:northBoundLatitude/gco:Decimal";
+    public static final String DATA_FILE = "/gmi:MI_Metadata/gmd:describes/gmx:MX_DataSet/gmx:dataFile[@xlink:href]";
+    public static final String DATA_FILE_FILE_NAME = "gmx:MX_DataFile/gmx:fileName/gmx:FileName";
+    public static final String DATA_FILE_FILE_DESCRIPTION = "gmx:MX_DataFile/gmx:fileDescription/gco:CharacterString";
+    public static final String DATA_FILE_FILE_FORMAT = "gmx:MX_DataFile/gmx:fileFormat/gmd:MD_Format/gmd:name/gco:CharacterString";
+    public static final String DATA_FILE_FILE_MIME_TYPE = "gmx:MX_DataFile/gmx:fileType/gmx:MimeFileType";
+
+    public static final String PARAMETER_NAME = "/gmi:MI_Metadata/gmd:contentInfo/gmd:MD_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:aName/gco:CharacterString";
+    public static final String QA_PERCENT_MISSING_DATA = "/gmi:MI_Metadata/gmd:contentInfo/gmd:MD_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:otherProperty/gco:Record/eos:AdditionalAttributes/eos:AdditionalAttribute[eos:reference/eos:EOS_AdditionalAttributeDescription/eos:name/gco:CharacterString[text()=\"QAPercentMissingData\"]]/eos:value/gco:CharacterString";
+    public static final String QA_PERCENT_OUT_OF_BOUNDS_DATA = "/gmi:MI_Metadata/gmd:contentInfo/gmd:MD_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:otherProperty/gco:Record/eos:AdditionalAttributes/eos:AdditionalAttribute[eos:reference/eos:EOS_AdditionalAttributeDescription/eos:name/gco:CharacterString[text()=\"QAPercentOutOfBoundsData\"]]/eos:value/gco:CharacterString";
+
+    public static final String PRODUCER_GRANULE_ID = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier[gmd:codeSpace/gco:CharacterString[text()=\"gov.nasa.esdis.umm.producergranuleid\"]]/gmd:code/gco:CharacterString";
+    public static final String CRID = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier[gmd:codeSpace/gco:CharacterString[text()=\"gov.nasa.esdis.umm.crid\"]]/gmd:code/gco:CharacterString";
+    public static final String IDENTIFIERS = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier[gmd:codeSpace/gco:CharacterString[text()=\"gov.nasa.esdis.umm.otherid\"]]";
+    public static final String IDENTIFIER_DESCRIPTION = "gmd:description/gco:CharacterString";
+
+    public static final String REPROCESSING_PLANNED = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceMaintenance/gmd:MD_MaintenanceInformation/gmd:maintenanceNote/gco:CharacterString";
+    public static final String REPROCESSING_ACTUAL = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmi:LE_ProcessStep/gmd:description/gco:CharacterString";
+
+    // AscendingCrossing, StartLatitude, StartDirection, EndLatitude, EndDirection
+    public static final String ORBIT = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicDescription[@id=\"Orbit\"]/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+
+    public static final String GRANULE_INPUT = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmi:LE_Source[gmd:description/gco:CharacterString[text()=\"GranuleInput\"]]/gmd:sourceCitation/gmd:CI_Citation/gmd:title/gmx:FileName";
+}
diff --git a/src/main/java/gov/nasa/cumulus/metadata/aggregator/IsoSmapXPath.java b/src/main/java/gov/nasa/cumulus/metadata/aggregator/IsoSmapXPath.java
@@ -0,0 +1,25 @@
+package gov.nasa.cumulus.metadata.aggregator;
+
+/**
+ * Class to define ISO-SMAP XPath Expressions
+ */
+public final class IsoSmapXPath extends IsoXPath {
+    private static final String BASE = "/gmd:DS_Series/gmd:composedOf/gmd:DS_DataSet/gmd:has/gmi:MI_Metadata";
+    private static final String CI_CITATION = "/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation";
+    public static final String PRODUCTION_DATE_TIME = BASE + "/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmi:LE_ProcessStep/gmd:dateTime/gco:DateTime";
+    public static final String CREATION_DATE_TIME = BASE + CI_CITATION + "/gmd:date/gmd:CI_Date/gmd:date/gco:DateTime";
+    public static final String BEGINNING_DATE_TIME = BASE + "/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition";
+    public static final String ENDING_DATE_TIME = BASE + "/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition";
+
+    public static final String PRODUCER_GRANULE_ID = BASE + CI_CITATION + "/gmd:title/gmx:FileName";
+    public static final String CRID = BASE + CI_CITATION + "/gmd:identifier[0]/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+    public static final String IDENTIFIERS = BASE + CI_CITATION + "/gmd:identifier[1]/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+    public static final String IDENTIFIER_DESCRIPTION = BASE + CI_CITATION + "/gmd:identifier[1]/gmd:MD_Identifier/gmd:description/gco:CharacterString";
+
+    public static final String ORBIT = BASE + "/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent[@id=\"boundingExtent\"]/gmd:geographicElement/gmd:EX_GeographicDescription[@id=\"Orbit\"]/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+
+    // OrbitNumber, EquatorCrossingLongitude, EquatorCrossingDateTime
+    public static final String OrbitCalculatedSpatialDomains = BASE + "/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent[@id=\"boundingExtent\"]/gmd:geographicElement/gmd:EX_GeographicDescription[@id=\"OrbitCalculatedSpatialDomains0\"]/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+
+    public static final String GRANULE_INPUT = BASE + CI_CITATION + "/gmd:title/gmx:FileName";
+}
diff --git a/src/main/java/gov/nasa/cumulus/metadata/aggregator/IsoXPath.java b/src/main/java/gov/nasa/cumulus/metadata/aggregator/IsoXPath.java
@@ -1,43 +1,26 @@
 package gov.nasa.cumulus.metadata.aggregator;
 
 /**
- * Class to define ISO-MENDS XPath Expressions
+ * Base class to define ISO XPath Expressions
  */
-public final class IsoXPath {
-    public static final String PRODUCTION_DATE_TIME = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmi:LE_ProcessStep/gmd:dateTime/gco:DateTime";
-    public static final String CREATION_DATE_TIME = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:DateTime";
-    public static final String BEGINNING_DATE_TIME = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition";
-    public static final String ENDING_DATE_TIME = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition";
-    public static final String POLYGON = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_BoundingPolygon/gmd:polygon/gml:Polygon/gml:exterior/gml:LinearRing/gml:posList";
-    public static final String WEST_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:westBoundLongitude/gco:Decimal";
-    public static final String SOUTH_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:southBoundLatitude/gco:Decimal";
-    public static final String EAST_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:eastBoundLongitude/gco:Decimal";
-    public static final String NORTH_BOUNDING_COORDINATE = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox/gmd:northBoundLatitude/gco:Decimal";
-    public static final String DATA_FILE = "/gmi:MI_Metadata/gmd:describes/gmx:MX_DataSet/gmx:dataFile[@xlink:href]";
-    public static final String DATA_FILE_FILE_NAME = "gmx:MX_DataFile/gmx:fileName/gmx:FileName";
-    public static final String DATA_FILE_FILE_DESCRIPTION = "gmx:MX_DataFile/gmx:fileDescription/gco:CharacterString";
-    public static final String DATA_FILE_FILE_FORMAT = "gmx:MX_DataFile/gmx:fileFormat/gmd:MD_Format/gmd:name/gco:CharacterString";
-    public static final String DATA_FILE_FILE_MIME_TYPE = "gmx:MX_DataFile/gmx:fileType/gmx:MimeFileType";
+public class IsoXPath {
+    public static String PRODUCTION_DATE_TIME;
+    public static String CREATION_DATE_TIME;
+    public static String BEGINNING_DATE_TIME;
+    public static String ENDING_DATE_TIME;
 
-    public static final String PARAMETER_NAME = "/gmi:MI_Metadata/gmd:contentInfo/gmd:MD_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:sequenceIdentifier/gco:MemberName/gco:aName/gco:CharacterString";
-    public static final String QA_PERCENT_MISSING_DATA = "/gmi:MI_Metadata/gmd:contentInfo/gmd:MD_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:otherProperty/gco:Record/eos:AdditionalAttributes/eos:AdditionalAttribute[eos:reference/eos:EOS_AdditionalAttributeDescription/eos:name/gco:CharacterString[text()=\"QAPercentMissingData\"]]/eos:value/gco:CharacterString";
-    public static final String QA_PERCENT_OUT_OF_BOUNDS_DATA = "/gmi:MI_Metadata/gmd:contentInfo/gmd:MD_CoverageDescription/gmd:dimension/gmd:MD_Band/gmd:otherProperty/gco:Record/eos:AdditionalAttributes/eos:AdditionalAttribute[eos:reference/eos:EOS_AdditionalAttributeDescription/eos:name/gco:CharacterString[text()=\"QAPercentOutOfBoundsData\"]]/eos:value/gco:CharacterString";
+    public static String PRODUCER_GRANULE_ID;
+    public static String CRID;
+    public static String IDENTIFIERS;
+    public static String IDENTIFIER_CODE = "gmd:code/gco:CharacterString";
+    public static String IDENTIFIER_DESCRIPTION;
 
-    public static final String PRODUCER_GRANULE_ID = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier[gmd:codeSpace/gco:CharacterString[text()=\"gov.nasa.esdis.umm.producergranuleid\"]]/gmd:code/gco:CharacterString";
-    public static final String CRID = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier[gmd:codeSpace/gco:CharacterString[text()=\"gov.nasa.esdis.umm.crid\"]]/gmd:code/gco:CharacterString";
-    public static final String IDENTIFIERS = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier[gmd:codeSpace/gco:CharacterString[text()=\"gov.nasa.esdis.umm.otherid\"]]";
-    public static final String IDENTIFIER_CODE = "gmd:code/gco:CharacterString";
-    public static final String IDENTIFIER_DESCRIPTION = "gmd:description/gco:CharacterString";
+    public static String SWOT_TRACK = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicDescription[@id=\"SWOTTrack\"]/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+    public static String ORBIT;
 
-    public static final String REPROCESSING_PLANNED = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceMaintenance/gmd:MD_MaintenanceInformation/gmd:maintenanceNote/gco:CharacterString";
-    public static final String REPROCESSING_ACTUAL = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmi:LE_ProcessStep/gmd:description/gco:CharacterString";
+    public static String PLATFORM = "/gmi:MI_Metadata/gmi:acquisitionInformation/gmi:MI_AcquisitionInformation/gmi:platform/eos:EOS_Platform/gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+    public static String INSTRUMENT = "/gmi:MI_Metadata/gmi:acquisitionInformation/gmi:MI_AcquisitionInformation/gmi:platform/eos:EOS_Platform/gmi:instrument/eos:EOS_Instrument/gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
 
-    public static final String SWOT_TRACK = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicDescription[@id=\"SWOTTrack\"]/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
-    public static final String ORBIT = "/gmi:MI_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicDescription[@id=\"Orbit\"]/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
-
-    public static final String PLATFORM = "/gmi:MI_Metadata/gmi:acquisitionInformation/gmi:MI_AcquisitionInformation/gmi:platform/eos:EOS_Platform/gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
-    public static final String INSTRUMENT = "/gmi:MI_Metadata/gmi:acquisitionInformation/gmi:MI_AcquisitionInformation/gmi:platform/eos:EOS_Platform/gmi:instrument/eos:EOS_Instrument/gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
-
-    public static final String GRANULE_INPUT = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:source/gmi:LE_Source[gmd:description/gco:CharacterString[text()=\"GranuleInput\"]]/gmd:sourceCitation/gmd:CI_Citation/gmd:title/gmx:FileName";
-    public static final String PGE_VERSION_CLASS = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmi:LE_ProcessStep[gmd:description/gco:CharacterString[text()=\"PGEVersionClass\"]]/gmi:processingInformation/eos:EOS_Processing/gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
+    public static String GRANULE_INPUT;
+    public static String PGE_VERSION_CLASS = "/gmi:MI_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:processStep/gmi:LE_ProcessStep[gmd:description/gco:CharacterString[text()=\"PGEVersionClass\"]]/gmi:processingInformation/eos:EOS_Processing/gmi:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString";
 }
diff --git a/src/main/java/gov/nasa/cumulus/metadata/aggregator/MetadataAggregatorCLI.java b/src/main/java/gov/nasa/cumulus/metadata/aggregator/MetadataAggregatorCLI.java
@@ -131,7 +131,7 @@ public static void processIsoMetadata(String granuleId, String s3Location, Strin
         MetadataFilesToEcho mtfe = new MetadataFilesToEcho(true);
         try {
             mtfe.readConfiguration(configFile);
-            mtfe.readIsoMendsMetadataFile(isoFile, s3Location);
+            mtfe.readIsoMetadataFile(isoFile, s3Location);
         } catch (Exception e) {
             log.error(e.getMessage());
             e.printStackTrace();

diff --git a/src/main/java/gov/nasa/cumulus/metadata/aggregator/MetadataAggregatorLambda.java b/src/main/java/gov/nasa/cumulus/metadata/aggregator/MetadataAggregatorLambda.java
@@ -128,18 +128,22 @@ public String PerformFunction(String input, Context context) throws Exception {
         }
 
         MetadataFilesToEcho mtfe;
-		if (iso != null) {
-            mtfe = new MetadataFilesToEcho(true);
-            mtfe.setDatasetValues(collectionName, collectionVersion, rangeIs360, boundingBox);
+        boolean isIsoFile = (iso != null);
+
+        mtfe = new MetadataFilesToEcho(isIsoFile);
+        mtfe.setDatasetValues(collectionName, collectionVersion, rangeIs360, boundingBox);
+        if (granules != null && granules.size() > 0) {
+            mtfe.setGranuleFileSizeAndChecksum(granules);
+        }
+
+		if (isIsoFile) {
             try {
-                mtfe.readIsoMendsMetadataFile(iso, s3Location);
+                mtfe.readIsoMetadataFile(iso, s3Location);
             } catch (IOException e) {
 				AdapterLogger.LogError(this.className + " MetadataFilesToEcho input TRUE read error:" + e.getMessage());
                 e.printStackTrace();
             }
         } else {
-		    mtfe = new MetadataFilesToEcho(false);
-            mtfe.setDatasetValues(collectionName, collectionVersion, rangeIs360, boundingBox);
             try {
                 AdapterLogger.LogInfo(this.className + " Creating UMM-G data structure");
                 if (meta != null) mtfe.readCommonMetadataFile(meta, s3Location);