set dataset name processor with test
Project: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/commit/bc043f6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/tree/bc043f6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/diff/bc043f6a Branch: refs/heads/master Commit: bc043f6a1aad9728771729584ad720e3b92a0b20 Parents: fe29b3a Author: Frank Greguska <[email protected]> Authored: Tue Jan 2 16:25:19 2018 -0800 Committer: Frank Greguska <[email protected]> Committed: Tue Jan 2 16:25:19 2018 -0800 ---------------------------------------------------------------------- .../processors/AddDayOfYearAttribute.java | 3 +- .../processors/AddTimeFromGranuleName.java | 3 +- .../processors/AddTimeToSectionSpec.java | 3 +- .../processors/CompositeItemProcessor.java | 3 +- .../ningester/processors/GenerateTileId.java | 3 +- .../processors/PythonChainProcessor.java | 3 +- .../ningester/processors/SetDatasetName.java | 29 ++++++++++++++++++ .../processors/TestGenerateTileId.java | 6 ++-- .../processors/TestSetDatasetName.java | 31 ++++++++++++++++++++ 9 files changed, 74 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttribute.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttribute.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttribute.java index d5acd10..f8aa693 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttribute.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttribute.java @@ -1,4 +1,5 @@ -/***************************************************************************** +/* + ***************************************************************************** * Copyright (c) 2018 Jet Propulsion Laboratory, * California Institute of Technology. All rights reserved *****************************************************************************/ http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleName.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleName.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleName.java index 8530f44..a83e6e3 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleName.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleName.java @@ -1,4 +1,5 @@ -/***************************************************************************** +/* +***************************************************************************** * Copyright (c) 2018 Jet Propulsion Laboratory, * California Institute of Technology. All rights reserved *****************************************************************************/ http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeToSectionSpec.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeToSectionSpec.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeToSectionSpec.java index c05f281..72af070 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeToSectionSpec.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeToSectionSpec.java @@ -1,4 +1,5 @@ -/***************************************************************************** +/* + ***************************************************************************** * Copyright (c) 2017 Jet Propulsion Laboratory, * California Institute of Technology. All rights reserved *****************************************************************************/ http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/CompositeItemProcessor.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/CompositeItemProcessor.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/CompositeItemProcessor.java index 463f6b9..af91307 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/CompositeItemProcessor.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/CompositeItemProcessor.java @@ -1,4 +1,5 @@ -/***************************************************************************** +/* + ***************************************************************************** * Copyright (c) 2017 Jet Propulsion Laboratory, * California Institute of Technology. All rights reserved *****************************************************************************/ http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileId.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileId.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileId.java index 3d28ce5..7bfcc0a 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileId.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileId.java @@ -1,4 +1,5 @@ -/***************************************************************************** +/* + ***************************************************************************** * Copyright (c) 2018 Jet Propulsion Laboratory, * California Institute of Technology. All rights reserved *****************************************************************************/ http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/PythonChainProcessor.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/PythonChainProcessor.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/PythonChainProcessor.java index 16ba33f..dc207a7 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/PythonChainProcessor.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/PythonChainProcessor.java @@ -1,4 +1,5 @@ -/***************************************************************************** +/* + ***************************************************************************** * Copyright (c) 2017 Jet Propulsion Laboratory, * California Institute of Technology. All rights reserved *****************************************************************************/ http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/SetDatasetName.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/SetDatasetName.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/SetDatasetName.java new file mode 100644 index 0000000..487b0fe --- /dev/null +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/SetDatasetName.java @@ -0,0 +1,29 @@ +/* + ****************************************************************************** + * Copyright (c) 2018 Jet Propulsion Laboratory, + * California Institute of Technology. All rights reserved + *****************************************************************************/ + +package gov.nasa.jpl.nexus.ningester.processors; + +import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; + + +public class SetDatasetName { + + String datasetName; + + public SetDatasetName(String datasetName) { + this.datasetName = datasetName; + } + + public NexusContent.NexusTile addDatasetName(NexusContent.NexusTile inputTile) { + + NexusContent.NexusTile.Builder outTileBuilder = NexusContent.NexusTile.newBuilder().mergeFrom(inputTile); + + outTileBuilder.getSummaryBuilder().setDatasetName(datasetName); + + return outTileBuilder.build(); + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java index abcbc1b..6747d23 100644 --- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestGenerateTileId.java @@ -8,8 +8,6 @@ package gov.nasa.jpl.nexus.ningester.processors; import org.junit.Test; import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; -import java.util.UUID; - import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -17,7 +15,7 @@ public class TestGenerateTileId { @Test - public void testGenerateId(){ + public void testGenerateId() { String granuleFileName = "19960421120000-NCEI-L4_GHRSST-SSTblend-AVHRR_OI-GLOB-v02.0-fv02.0.nc"; String sectionSpec = "time:0:1,lat:140:160,lon:640:680"; @@ -44,7 +42,7 @@ public class TestGenerateTileId { } @Test - public void testGenerateIdWithSalt(){ + public void testGenerateIdWithSalt() { String granuleFileName = "CCMP_Wind_Analysis_19990928_V02.0_L3.0_RSS.nc"; String sectionSpec = "time:3:4,longitude:174:261,latitude:152:190"; http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/bc043f6a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestSetDatasetName.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestSetDatasetName.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestSetDatasetName.java new file mode 100644 index 0000000..148c27a --- /dev/null +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/TestSetDatasetName.java @@ -0,0 +1,31 @@ +/* + ****************************************************************************** + * Copyright (c) 2018 Jet Propulsion Laboratory, + * California Institute of Technology. All rights reserved + *****************************************************************************/ + +package gov.nasa.jpl.nexus.ningester.processors; + +import org.junit.Test; +import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +public class TestSetDatasetName { + + @Test + public void testDatasetName() { + + String datasetName = "testDataset"; + + NexusContent.NexusTile input = NexusContent.NexusTile.newBuilder().build(); + + SetDatasetName processor = new SetDatasetName(datasetName); + + NexusContent.NexusTile result = processor.addDatasetName(input); + + assertThat(result.getSummary().getDatasetName(), is(datasetName)); + + } +} \ No newline at end of file
