updated dependency to the new org.apache.sdap nexusproto project
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/38b70766 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/tree/38b70766 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/diff/38b70766 Branch: refs/heads/master Commit: 38b7076612acd3088072dfb793d010c1e7899b2e Parents: 83fa16c Author: Frank Greguska <[email protected]> Authored: Mon Jan 22 15:41:19 2018 -0800 Committer: Frank Greguska <[email protected]> Committed: Mon Jan 22 15:41:19 2018 -0800 ---------------------------------------------------------------------- build.gradle | 21 ++++++++-------- settings.gradle | 2 +- .../ningester/configuration/AppConfig.java | 6 ++--- .../ningester/configuration/BatchConfig.java | 22 ++++++++--------- .../ningester/datatiler/NetCDFItemReader.java | 21 ++++------------ .../ningester/http/NexusTileConverter.java | 12 +++++----- .../ningester/processors/AddDatasetName.java | 7 +++--- .../processors/AddDayOfYearAttribute.java | 14 +++++------ .../processors/AddTimeFromGranuleName.java | 6 ++--- .../ningester/processors/GenerateTileId.java | 6 ++--- .../processors/PythonChainProcessor.java | 6 ++--- .../nexus/ningester/writer/CassandraStore.java | 7 +++--- .../jpl/nexus/ningester/writer/DataStore.java | 4 ++-- .../jpl/nexus/ningester/writer/DynamoStore.java | 10 ++++---- .../nexus/ningester/writer/MetadataStore.java | 6 ++--- .../jpl/nexus/ningester/writer/NexusWriter.java | 4 ++-- .../jpl/nexus/ningester/writer/S3Store.java | 2 +- .../jpl/nexus/ningester/writer/SolrStore.java | 15 ++++++------ .../datatiler/NetCDFItemReaderTest.java | 8 +++---- .../processors/AddDatasetNameTest.java | 6 ++--- .../processors/AddDayOfYearAttributeTest.java | 17 ++++++------- .../processors/AddTimeFromGranuleNameTest.java | 25 +++++++++++--------- .../processors/GenerateTileIdTest.java | 15 ++++++------ .../nexus/ningester/writer/SolrStoreTest.java | 24 +++++++++---------- 24 files changed, 130 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index ff30ed2..178f6dc 100644 --- a/build.gradle +++ b/build.gradle @@ -7,28 +7,29 @@ plugins { id 'java' id 'idea' - id 'propdeps' - id 'propdeps-maven' - id 'propdeps-idea' - id 'propdeps-eclipse' + id 'propdeps' version '0.0.9.RELEASE' + id 'propdeps-maven' version '0.0.9.RELEASE' + id 'propdeps-idea' version '0.0.9.RELEASE' + id 'propdeps-eclipse' version '0.0.9.RELEASE' id 'org.springframework.boot' version '1.5.9.RELEASE' id 'org.unbroken-dome.test-sets' version '1.4.2' + id 'net.researchgate.release' version '2.6.0' } -group = 'gov.nasa.jpl.nexus.ningester' -version = '0.0.1-SNAPSHOT' -sourceCompatibility = 1.8 +//group = 'gov.nasa.jpl.nexus.ningester' +//version = '0.0.1-SNAPSHOT' +//sourceCompatibility = 1.8 repositories { mavenCentral() maven { + mavenLocal() url "https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases/"; } - mavenLocal() } ext{ - nexusMessagesVersion = "1.2.0.RELEASE" + nexusprotoVersion = "1.0.1-SNAPSHOT" protobufUtilVersion = "3.5.1" netcdfJavaVersion = '4.6.9' guavaVersion = "23.2-jre" @@ -53,7 +54,7 @@ dependencies { compile("org.springframework.data:spring-data-solr") compile("com.h2database:h2") - compile("org.nasa.jpl.nexus:nexus-messages:$nexusMessagesVersion") + compile("org.apache.sdap:nexusproto:$nexusprotoVersion") compile("com.google.protobuf:protobuf-java-util:$protobufUtilVersion") compile("edu.ucar:cdm:${netcdfJavaVersion}") http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/settings.gradle ---------------------------------------------------------------------- diff --git a/settings.gradle b/settings.gradle index 7acaab2..de5996a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ pluginManagement { resolutionStrategy { eachPlugin { if (requested.id.name?.startsWith('propdeps')) { - useModule('io.spring.gradle:propdeps-plugin:0.0.9.RELEASE') + useModule("io.spring.gradle:propdeps-plugin:${requested.version}") } } } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/AppConfig.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/AppConfig.java b/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/AppConfig.java index 05b6e32..b653ab3 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/AppConfig.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/AppConfig.java @@ -14,7 +14,7 @@ import gov.nasa.jpl.nexus.ningester.processors.*; import gov.nasa.jpl.nexus.ningester.writer.DataStore; import gov.nasa.jpl.nexus.ningester.writer.MetadataStore; import gov.nasa.jpl.nexus.ningester.writer.NexusWriter; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -89,11 +89,11 @@ public class AppConfig { public MetadataStore metadataStore() { return new MetadataStore() { @Override - public void saveMetadata(List<? extends NexusContent.NexusTile> nexusTiles) { + public void saveMetadata(List<? extends NexusTile> nexusTiles) { } @Override - public void deleteMetadata(List<? extends NexusContent.NexusTile> nexusTiles) { + public void deleteMetadata(List<? extends NexusTile> nexusTiles) { } }; } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java b/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java index dc01195..7571173 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java @@ -5,7 +5,7 @@ import gov.nasa.jpl.nexus.ningester.datatiler.FileSlicer; import gov.nasa.jpl.nexus.ningester.datatiler.NetCDFItemReader; import gov.nasa.jpl.nexus.ningester.processors.*; import gov.nasa.jpl.nexus.ningester.writer.NexusWriter; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; @@ -58,7 +58,7 @@ public class BatchConfig { @Bean @JobScope - protected ItemStreamReader<NexusContent.NexusTile> reader(FileSlicer fileSlicer, Resource granule) { + protected ItemStreamReader<NexusTile> reader(FileSlicer fileSlicer, Resource granule) { NetCDFItemReader reader = new NetCDFItemReader(fileSlicer); reader.setResource(granule); return reader; @@ -66,21 +66,21 @@ public class BatchConfig { @Bean @JobScope - protected ItemProcessor<NexusContent.NexusTile, NexusContent.NexusTile> processor() { + protected ItemProcessor<NexusTile, NexusTile> processor() { return new CompositeItemProcessor<>(applicationProperties.getTileProcessors()); } @Bean @JobScope - protected ItemWriter<NexusContent.NexusTile> writer(NexusWriter nexusWriter) { + protected ItemWriter<NexusTile> writer(NexusWriter nexusWriter) { return nexusWriter::saveToNexus; } @Bean @JobScope - protected Step ingestGranule(ItemStreamReader<NexusContent.NexusTile> reader, ItemProcessor<NexusContent.NexusTile, NexusContent.NexusTile> processor, ItemWriter<NexusContent.NexusTile> writer) { + protected Step ingestGranule(ItemStreamReader<NexusTile> reader, ItemProcessor<NexusTile, NexusTile> processor, ItemWriter<NexusTile> writer) { return steps.get("ingestGranule") - .<NexusContent.NexusTile, NexusContent.NexusTile>chunk(10) + .<NexusTile, NexusTile>chunk(10) .reader(reader) .processor(processor) .writer(writer).build(); @@ -91,31 +91,31 @@ public class BatchConfig { */ @Bean @ConditionalOnBean(AddDatasetName.class) - protected ItemProcessor<NexusContent.NexusTile, NexusContent.NexusTile> addDatasetName(AddDatasetName addDatasetNameBean) { + protected ItemProcessor<NexusTile, NexusTile> addDatasetName(AddDatasetName addDatasetNameBean) { return addDatasetNameBean::addDatasetName; } @Bean @ConditionalOnBean(AddDayOfYearAttribute.class) - protected ItemProcessor<NexusContent.NexusTile, NexusContent.NexusTile> addDayOfYearAttribute(AddDayOfYearAttribute addDayOfYearAttributeBean) { + protected ItemProcessor<NexusTile, NexusTile> addDayOfYearAttribute(AddDayOfYearAttribute addDayOfYearAttributeBean) { return addDayOfYearAttributeBean::setDayOfYearFromGranuleName; } @Bean @ConditionalOnBean(AddTimeFromGranuleName.class) - protected ItemProcessor<NexusContent.NexusTile, NexusContent.NexusTile> addTimeFromGranuleName(AddTimeFromGranuleName addTimeFromGranuleNameBean) { + protected ItemProcessor<NexusTile, NexusTile> addTimeFromGranuleName(AddTimeFromGranuleName addTimeFromGranuleNameBean) { return addTimeFromGranuleNameBean::setTimeFromGranuleName; } @Bean @ConditionalOnBean(GenerateTileId.class) - protected ItemProcessor<NexusContent.NexusTile, NexusContent.NexusTile> generateTileId(GenerateTileId generateTileIdBean) { + protected ItemProcessor<NexusTile, NexusTile> generateTileId(GenerateTileId generateTileIdBean) { return generateTileIdBean::addTileId; } @Bean @ConditionalOnBean(PythonChainProcessor.class) - protected ItemProcessor<NexusContent.NexusTile, NexusContent.NexusTile> pythonChainProcessor(PythonChainProcessor pythonChainProcessorBean) { + protected ItemProcessor<NexusTile, NexusTile> pythonChainProcessor(PythonChainProcessor pythonChainProcessorBean) { return pythonChainProcessorBean::nexusTileProcessor; } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReader.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReader.java b/src/main/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReader.java index 9ca87a5..f5646d1 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReader.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReader.java @@ -1,6 +1,6 @@ package gov.nasa.jpl.nexus.ningester.datatiler; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.item.ExecutionContext; @@ -17,7 +17,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -public class NetCDFItemReader implements ResourceAwareItemReaderItemStream<NexusContent.NexusTile> { +public class NetCDFItemReader implements ResourceAwareItemReaderItemStream<NexusTile> { static final String CURRENT_TILE_SPEC_INDEX_KEY = "current.tile.spec.index"; private static final Logger log = LoggerFactory.getLogger(NetCDFItemReader.class); @@ -38,7 +38,7 @@ public class NetCDFItemReader implements ResourceAwareItemReaderItemStream<Nexus } @Override - public NexusContent.NexusTile read() { + public NexusTile read() { if (this.currentTileSpecIndex == this.tileSpecList.size()) { //End of stream return null; @@ -52,23 +52,10 @@ public class NetCDFItemReader implements ResourceAwareItemReaderItemStream<Nexus throw new UnexpectedInputException("Generic IOException", e); } - NexusContent.NexusTile.Builder nexusTileBuilder = NexusContent.NexusTile.newBuilder(); + NexusTile.Builder nexusTileBuilder = NexusTile.newBuilder(); nexusTileBuilder.getSummaryBuilder() .setSectionSpec(currentSpec) .setGranule(netCDFUrl.toString()); -// Map<String, String> dimensionToSpec = Arrays.stream(currentSpec.split(",")) -// .collect(Collectors.toMap( -// dimension -> dimension.split(":")[0], -// dimension -> dimension.substring(dimension.indexOf(":") + 1, dimension.length()))); -// -// Variable varToRead = this.ds.getVariables().get(0); -// String spec = varToRead.getDimensions().stream() -// .map(dimension -> dimensionToSpec.get(dimension.getShortName())) -// .filter(Objects::nonNull) -// .collect(Collectors.joining(",")); -// -// spec = ":," + spec; -// Array data = this.ds.getVariables().get(0).read(spec); this.currentTileSpecIndex++; return nexusTileBuilder.build(); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/http/NexusTileConverter.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/http/NexusTileConverter.java b/src/main/java/gov/nasa/jpl/nexus/ningester/http/NexusTileConverter.java index 5f1245c..8305e66 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/http/NexusTileConverter.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/http/NexusTileConverter.java @@ -5,7 +5,7 @@ package gov.nasa.jpl.nexus.ningester.http; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.converter.AbstractHttpMessageConverter; @@ -15,21 +15,21 @@ import org.springframework.http.converter.HttpMessageNotWritableException; import java.io.IOException; import java.io.OutputStream; -public class NexusTileConverter extends AbstractHttpMessageConverter<NexusContent.NexusTile> { +public class NexusTileConverter extends AbstractHttpMessageConverter<NexusTile> { @Override protected boolean supports(Class<?> clazz) { - return NexusContent.NexusTile.class.isAssignableFrom(clazz); + return NexusTile.class.isAssignableFrom(clazz); } @Override - protected NexusContent.NexusTile readInternal(Class<? extends NexusContent.NexusTile> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { + protected NexusTile readInternal(Class<? extends NexusTile> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { - return NexusContent.NexusTile.parseFrom(inputMessage.getBody()); + return NexusTile.parseFrom(inputMessage.getBody()); } @Override - protected void writeInternal(NexusContent.NexusTile nexusTile, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { + protected void writeInternal(NexusTile nexusTile, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { try { OutputStream outputStream = outputMessage.getBody(); nexusTile.writeTo(outputStream); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetName.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetName.java b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetName.java index a150936..b08757a 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetName.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetName.java @@ -6,8 +6,7 @@ package gov.nasa.jpl.nexus.ningester.processors; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; - +import org.apache.sdap.nexusproto.NexusTile; public class AddDatasetName { @@ -17,9 +16,9 @@ public class AddDatasetName { this.datasetName = datasetName; } - public NexusContent.NexusTile addDatasetName(NexusContent.NexusTile inputTile) { + public NexusTile addDatasetName(NexusTile inputTile) { - NexusContent.NexusTile.Builder outTileBuilder = NexusContent.NexusTile.newBuilder().mergeFrom(inputTile); + NexusTile.Builder outTileBuilder = NexusTile.newBuilder().mergeFrom(inputTile); outTileBuilder.getSummaryBuilder().setDatasetName(datasetName); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/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 f8aa693..c22cb34 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 @@ -6,8 +6,9 @@ package gov.nasa.jpl.nexus.ningester.processors; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; -import org.springframework.beans.factory.annotation.Autowired; +import org.apache.sdap.nexusproto.Attribute; +import org.apache.sdap.nexusproto.NexusTile; +import org.apache.sdap.nexusproto.TileSummary; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -23,7 +24,6 @@ public class AddDayOfYearAttribute { * @param regex Regex used to match against the granule name. Must define exactly one capturing group that captures * the day of year. */ - @Autowired public AddDayOfYearAttribute(String regex) { this.regex = Pattern.compile(regex); } @@ -34,7 +34,7 @@ public class AddDayOfYearAttribute { * @param nexusTile The tile to process * @return The processed tile */ - public NexusContent.NexusTile setDayOfYearFromGranuleName(NexusContent.NexusTile nexusTile) { + public NexusTile setDayOfYearFromGranuleName(NexusTile nexusTile) { String granuleName = nexusTile.getSummary().getGranule(); Matcher granuleNameMatcher = this.regex.matcher(granuleName); @@ -54,10 +54,10 @@ public class AddDayOfYearAttribute { String dayOfYear = granuleNameMatcher.group(1); - NexusContent.NexusTile.Builder newTileBuilder = NexusContent.NexusTile.newBuilder().mergeFrom(nexusTile); - NexusContent.TileSummary.Builder newTileSummaryBuilder = newTileBuilder.getSummaryBuilder(); + NexusTile.Builder newTileBuilder = NexusTile.newBuilder().mergeFrom(nexusTile); + TileSummary.Builder newTileSummaryBuilder = newTileBuilder.getSummaryBuilder(); newTileSummaryBuilder.addGlobalAttributes( - NexusContent.Attribute.newBuilder() + Attribute.newBuilder() .setName("day_of_year_i") .addValues(dayOfYear) .build() http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/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 0f53a1c..2886b93 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 @@ -5,7 +5,7 @@ *****************************************************************************/ package gov.nasa.jpl.nexus.ningester.processors; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -28,9 +28,9 @@ public class AddTimeFromGranuleName { this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); } - public NexusContent.NexusTile setTimeFromGranuleName(NexusContent.NexusTile inputTile) { + public NexusTile setTimeFromGranuleName(NexusTile inputTile) { - NexusContent.NexusTile.Builder outTileBuilder = NexusContent.NexusTile.newBuilder().mergeFrom(inputTile); + NexusTile.Builder outTileBuilder = NexusTile.newBuilder().mergeFrom(inputTile); switch (inputTile.getTile().getTileTypeCase()) { case GRID_TILE: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/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 dfa69ac..dd1913b 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 @@ -7,7 +7,7 @@ package gov.nasa.jpl.nexus.ningester.processors; import com.google.common.io.Files; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import java.net.URI; import java.net.URISyntaxException; @@ -23,9 +23,9 @@ public class GenerateTileId { this.salt = salt; } - public NexusContent.NexusTile addTileId(NexusContent.NexusTile inputTile) { + public NexusTile addTileId(NexusTile inputTile) { - NexusContent.NexusTile.Builder outTileBuilder = NexusContent.NexusTile.newBuilder().mergeFrom(inputTile); + NexusTile.Builder outTileBuilder = NexusTile.newBuilder().mergeFrom(inputTile); String granuleFileName = inputTile.getSummary().getGranule(); Path granulePath = null; try { http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/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 2c09b87..a54f49e 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 @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.util.JsonFormat; import gov.nasa.jpl.nexus.ningester.processors.properties.PythonProcessorModule; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -32,7 +32,7 @@ public class PythonChainProcessor { this.restTemplate = restTemplate; } - public NexusContent.NexusTile nexusTileProcessor(NexusContent.NexusTile nexusTile) { + public NexusTile nexusTileProcessor(NexusTile nexusTile) { HttpHeaders headers = new HttpHeaders(); headers.setAccept(Collections.singletonList(MediaType.APPLICATION_OCTET_STREAM)); @@ -52,7 +52,7 @@ public class PythonChainProcessor { uriPath, HttpMethod.POST, requestEntity, - NexusContent.NexusTile.class).getBody(); + NexusTile.class).getBody(); } public void setProcessorList(List<PythonProcessorModule> processorList) { http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/writer/CassandraStore.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/CassandraStore.java b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/CassandraStore.java index 6e9bcd2..c466d7b 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/CassandraStore.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/CassandraStore.java @@ -6,7 +6,8 @@ package gov.nasa.jpl.nexus.ningester.writer; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; +import org.apache.sdap.nexusproto.TileData; import org.springframework.data.cassandra.core.CassandraOperations; import java.nio.ByteBuffer; @@ -27,7 +28,7 @@ public class CassandraStore implements DataStore { } @Override - public void saveData(List<? extends NexusContent.NexusTile> nexusTiles) { + public void saveData(List<? extends NexusTile> nexusTiles) { String query = "insert into " + this.tableName + " (tile_id, tile_blob) VALUES (?, ?)"; cassandraTemplate.ingest(query, nexusTiles.stream() @@ -35,7 +36,7 @@ public class CassandraStore implements DataStore { .collect(Collectors.toList())); } - private List<Object> getCassandraRowFromTileData(NexusContent.TileData tile) { + private List<Object> getCassandraRowFromTileData(TileData tile) { UUID tileId = UUID.fromString(tile.getTileId()); return Arrays.asList(tileId, ByteBuffer.wrap(tile.toByteArray())); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DataStore.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DataStore.java b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DataStore.java index 499ac34..d1fd52a 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DataStore.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DataStore.java @@ -6,11 +6,11 @@ package gov.nasa.jpl.nexus.ningester.writer; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import java.util.List; public interface DataStore { - void saveData(List<? extends NexusContent.NexusTile> nexusTiles); + void saveData(List<? extends NexusTile> nexusTiles); } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DynamoStore.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DynamoStore.java b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DynamoStore.java index ebcc5a6..b0f6549 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DynamoStore.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/DynamoStore.java @@ -9,7 +9,7 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.document.DynamoDB; import com.amazonaws.services.dynamodbv2.document.Item; import com.amazonaws.services.dynamodbv2.document.Table; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import java.util.List; @@ -28,11 +28,11 @@ public class DynamoStore implements DataStore { this.primaryKey = primaryKey; } - public void saveData(List<? extends NexusContent.NexusTile> nexusTiles) { + public void saveData(List<? extends NexusTile> nexusTiles) { Table table = dynamoDB.getTable(tableName); - for (NexusContent.NexusTile tile : nexusTiles) { + for (NexusTile tile : nexusTiles) { String tileId = getTileId(tile); byte[] tileData = getTileData(tile); @@ -44,11 +44,11 @@ public class DynamoStore implements DataStore { } } - private String getTileId(NexusContent.NexusTile tile) { + private String getTileId(NexusTile tile) { return tile.getTile().getTileId(); } - private byte[] getTileData(NexusContent.NexusTile tile) { + private byte[] getTileData(NexusTile tile) { return tile.getTile().toByteArray(); } } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/writer/MetadataStore.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/MetadataStore.java b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/MetadataStore.java index c9323c5..69a0937 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/MetadataStore.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/MetadataStore.java @@ -5,13 +5,13 @@ package gov.nasa.jpl.nexus.ningester.writer; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import java.util.List; public interface MetadataStore { - void saveMetadata(List<? extends NexusContent.NexusTile> nexusTiles); + void saveMetadata(List<? extends NexusTile> nexusTiles); - void deleteMetadata(List<? extends NexusContent.NexusTile> nexusTiles); + void deleteMetadata(List<? extends NexusTile> nexusTiles); } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/writer/NexusWriter.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/NexusWriter.java b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/NexusWriter.java index 0156b5a..6869f08 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/NexusWriter.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/NexusWriter.java @@ -6,7 +6,7 @@ package gov.nasa.jpl.nexus.ningester.writer; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; +import org.apache.sdap.nexusproto.NexusTile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +23,7 @@ public class NexusWriter { this.dataStore = dataStore; } - public void saveToNexus(List<? extends NexusContent.NexusTile> nexusTiles) { + public void saveToNexus(List<? extends NexusTile> nexusTiles) { if (nexusTiles.size() > 0) { metadataStore.saveMetadata(nexusTiles); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/writer/S3Store.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/S3Store.java b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/S3Store.java index 2c71521..6dc75f4 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/S3Store.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/S3Store.java @@ -10,7 +10,7 @@ import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent.NexusTile; +import org.apache.sdap.nexusproto.NexusTile; import java.io.ByteArrayInputStream; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/main/java/gov/nasa/jpl/nexus/ningester/writer/SolrStore.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/SolrStore.java b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/SolrStore.java index b3198ea..0a48733 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/writer/SolrStore.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/writer/SolrStore.java @@ -5,9 +5,10 @@ package gov.nasa.jpl.nexus.ningester.writer; +import org.apache.sdap.nexusproto.NexusTile; +import org.apache.sdap.nexusproto.TileSummary; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputField; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.solr.core.SolrOperations; @@ -39,7 +40,7 @@ public class SolrStore implements MetadataStore { } @Override - public void saveMetadata(List<? extends NexusContent.NexusTile> nexusTiles) { + public void saveMetadata(List<? extends NexusTile> nexusTiles) { List<SolrInputDocument> solrdocs = nexusTiles.stream() .map(nexusTile -> getSolrDocFromTileSummary(nexusTile.getSummary())) @@ -48,7 +49,7 @@ public class SolrStore implements MetadataStore { } @Override - public void deleteMetadata(List<? extends NexusContent.NexusTile> nexusTiles) { + public void deleteMetadata(List<? extends NexusTile> nexusTiles) { List<String> tileIds = nexusTiles.stream() .map(nexusTile -> nexusTile.getSummary().getDatasetName() + "!" + nexusTile.getSummary().getTileId()) @@ -56,10 +57,10 @@ public class SolrStore implements MetadataStore { solr.deleteById(this.collection, tileIds); } - public SolrInputDocument getSolrDocFromTileSummary(NexusContent.TileSummary summary) { + public SolrInputDocument getSolrDocFromTileSummary(TileSummary summary) { - NexusContent.TileSummary.BBox bbox = summary.getBbox(); - NexusContent.TileSummary.DataStats stats = summary.getStats(); + TileSummary.BBox bbox = summary.getBbox(); + TileSummary.DataStats stats = summary.getStats(); Calendar startCal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); startCal.setTime(new Date(stats.getMinTime() * 1000)); @@ -100,7 +101,7 @@ public class SolrStore implements MetadataStore { return inputDocument; } - private String determineGeo(NexusContent.TileSummary summary) { + private String determineGeo(TileSummary summary) { //Solr cannot index a POLYGON where all corners are the same point or when there are only 2 distinct points (line). //Solr is configured for a specific precision so we need to round to that precision before checking equality. Integer geoPrecision = this.geoPrecision; http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/test/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReaderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReaderTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReaderTest.java index d677a45..a874ac0 100644 --- a/src/test/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReaderTest.java +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/datatiler/NetCDFItemReaderTest.java @@ -1,7 +1,7 @@ package gov.nasa.jpl.nexus.ningester.datatiler; +import org.apache.sdap.nexusproto.NexusTile; import org.junit.Test; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; import org.springframework.batch.item.ExecutionContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -44,7 +44,7 @@ public class NetCDFItemReaderTest { ExecutionContext context = new ExecutionContext(); reader.open(context); - NexusContent.NexusTile result = reader.read(); + NexusTile result = reader.read(); assertThat(result.getSummary().getSectionSpec(), is("lat:0:10,lon:0:20")); assertThat(result.getSummary().getGranule(), is(testResource.getURL().toString())); @@ -67,8 +67,8 @@ public class NetCDFItemReaderTest { ExecutionContext context = new ExecutionContext(); reader.open(context); - List<NexusContent.NexusTile> results = new ArrayList<>(); - NexusContent.NexusTile result; + List<NexusTile> results = new ArrayList<>(); + NexusTile result; while ((result = reader.read()) != null) { results.add(result); } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java index 42d594c..71b5c46 100644 --- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDatasetNameTest.java @@ -6,8 +6,8 @@ package gov.nasa.jpl.nexus.ningester.processors; +import org.apache.sdap.nexusproto.NexusTile; import org.junit.Test; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -19,11 +19,11 @@ public class AddDatasetNameTest { String datasetName = "testDataset"; - NexusContent.NexusTile input = NexusContent.NexusTile.newBuilder().build(); + NexusTile input = NexusTile.newBuilder().build(); AddDatasetName processor = new AddDatasetName(datasetName); - NexusContent.NexusTile result = processor.addDatasetName(input); + NexusTile result = processor.addDatasetName(input); assertThat(result.getSummary().getDatasetName(), is(datasetName)); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java index 13137a2..4722eaf 100644 --- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddDayOfYearAttributeTest.java @@ -5,10 +5,11 @@ package gov.nasa.jpl.nexus.ningester.processors; +import org.apache.sdap.nexusproto.NexusTile; +import org.apache.sdap.nexusproto.TileSummary; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -24,15 +25,15 @@ public class AddDayOfYearAttributeTest { public void testSuccessfulMatch() { String regex = "^(\\d{3})"; String granuleName = "001.L4_5day_avhrr_clim_sst_pixelMean.nc"; - NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary( - NexusContent.TileSummary.newBuilder() + NexusTile nexusTile = NexusTile.newBuilder().setSummary( + TileSummary.newBuilder() .setGranule(granuleName) .build() ).build(); AddDayOfYearAttribute processor = new AddDayOfYearAttribute(regex); - NexusContent.NexusTile result = processor.setDayOfYearFromGranuleName(nexusTile); + NexusTile result = processor.setDayOfYearFromGranuleName(nexusTile); assertThat(result.getSummary().getGlobalAttributesList(), contains( hasProperty("name", is("day_of_year_i")) @@ -50,8 +51,8 @@ public class AddDayOfYearAttributeTest { String regex = "^(\\d{3})"; String granuleName = "L4_5day_avhrr_clim_sst_pixelMean.nc"; - NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary( - NexusContent.TileSummary.newBuilder() + NexusTile nexusTile = NexusTile.newBuilder().setSummary( + TileSummary.newBuilder() .setGranule(granuleName) .build() ).build(); @@ -69,8 +70,8 @@ public class AddDayOfYearAttributeTest { String regex = "^\\d{3}"; String granuleName = "001.L4_5day_avhrr_clim_sst_pixelMean.nc"; - NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary( - NexusContent.TileSummary.newBuilder() + NexusTile nexusTile = NexusTile.newBuilder().setSummary( + TileSummary.newBuilder() .setGranule(granuleName) .build() ).build(); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java index ab8d214..b59be7d 100644 --- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/AddTimeFromGranuleNameTest.java @@ -4,10 +4,13 @@ *****************************************************************************/ package gov.nasa.jpl.nexus.ningester.processors; +import org.apache.sdap.nexusproto.GridTile; +import org.apache.sdap.nexusproto.NexusTile; +import org.apache.sdap.nexusproto.TileData; +import org.apache.sdap.nexusproto.TileSummary; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; import java.text.ParseException; @@ -29,14 +32,14 @@ public class AddTimeFromGranuleNameTest { String granuleName = "A2012001.L3m_DAY_NSST_sst_4km.nc"; Long expectedTime = 1325376000L; // 01/01/2012 00:00:00 in epoch time - NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary( - NexusContent.TileSummary.newBuilder() + NexusTile nexusTile = NexusTile.newBuilder().setSummary( + TileSummary.newBuilder() .setGranule(granuleName) .build() ).setTile( - NexusContent.TileData.newBuilder() + TileData.newBuilder() .setGridTile( - NexusContent.GridTile.newBuilder( + GridTile.newBuilder( ).build() ).build() @@ -44,7 +47,7 @@ public class AddTimeFromGranuleNameTest { AddTimeFromGranuleName processor = new AddTimeFromGranuleName(regex, dateFormat); - NexusContent.NexusTile result = processor.setTimeFromGranuleName(nexusTile); + NexusTile result = processor.setTimeFromGranuleName(nexusTile); assertThat(result.getTile().getGridTile().getTime(), is(expectedTime)); assertThat(result.getSummary().getStats().getMinTime(), is(expectedTime)); @@ -61,14 +64,14 @@ public class AddTimeFromGranuleNameTest { thrown.expect(RuntimeException.class); thrown.expectCause(isA(ParseException.class)); - NexusContent.NexusTile nexusTile = NexusContent.NexusTile.newBuilder().setSummary( - NexusContent.TileSummary.newBuilder() + NexusTile nexusTile = NexusTile.newBuilder().setSummary( + TileSummary.newBuilder() .setGranule(granuleName) .build() ).setTile( - NexusContent.TileData.newBuilder() + TileData.newBuilder() .setGridTile( - NexusContent.GridTile.newBuilder( + GridTile.newBuilder( ).build() ).build() @@ -76,7 +79,7 @@ public class AddTimeFromGranuleNameTest { AddTimeFromGranuleName processor = new AddTimeFromGranuleName(regex, dateFormat); - NexusContent.NexusTile result = processor.setTimeFromGranuleName(nexusTile); + NexusTile result = processor.setTimeFromGranuleName(nexusTile); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java index 7516012..5cfdad2 100644 --- a/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/processors/GenerateTileIdTest.java @@ -5,8 +5,9 @@ package gov.nasa.jpl.nexus.ningester.processors; +import org.apache.sdap.nexusproto.NexusTile; +import org.apache.sdap.nexusproto.TileData; import org.junit.Test; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -22,14 +23,14 @@ public class GenerateTileIdTest { String expectedId = "c031a9c4-9e1d-32e9-9d5c-d2497ce74920"; - NexusContent.NexusTile.Builder inputTileBuilder = NexusContent.NexusTile.newBuilder(); + NexusTile.Builder inputTileBuilder = NexusTile.newBuilder(); inputTileBuilder.getSummaryBuilder().setGranule(granuleFileName); inputTileBuilder.getSummaryBuilder().setSectionSpec(sectionSpec); - inputTileBuilder.setTile(NexusContent.TileData.newBuilder()); + inputTileBuilder.setTile(TileData.newBuilder()); GenerateTileId processor = new GenerateTileId(); - NexusContent.NexusTile result = processor.addTileId(inputTileBuilder.build()); + NexusTile result = processor.addTileId(inputTileBuilder.build()); assertThat(result.getSummary().getTileId(), is(expectedId)); assertThat(result.getTile().getTileId(), is(expectedId)); @@ -45,15 +46,15 @@ public class GenerateTileIdTest { String expectedId = "48da50ef-e92c-3562-89f9-470561a06482"; - NexusContent.NexusTile.Builder inputTileBuilder = NexusContent.NexusTile.newBuilder(); + NexusTile.Builder inputTileBuilder = NexusTile.newBuilder(); inputTileBuilder.getSummaryBuilder().setGranule(granuleFileName); inputTileBuilder.getSummaryBuilder().setSectionSpec(sectionSpec); - inputTileBuilder.setTile(NexusContent.TileData.newBuilder()); + inputTileBuilder.setTile(TileData.newBuilder()); GenerateTileId processor = new GenerateTileId(); processor.setSalt(salt); - NexusContent.NexusTile result = processor.addTileId(inputTileBuilder.build()); + NexusTile result = processor.addTileId(inputTileBuilder.build()); assertThat(result.getSummary().getTileId(), is(expectedId)); assertThat(result.getTile().getTileId(), is(expectedId)); http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/38b70766/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java b/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java index 0bdd177..9fd5173 100644 --- a/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java +++ b/src/test/java/gov/nasa/jpl/nexus/ningester/writer/SolrStoreTest.java @@ -5,9 +5,9 @@ package gov.nasa.jpl.nexus.ningester.writer; +import org.apache.sdap.nexusproto.TileSummary; import org.apache.solr.common.SolrInputDocument; import org.junit.Test; -import org.nasa.jpl.nexus.ingest.wiretypes.NexusContent; import static org.junit.Assert.assertEquals; @@ -17,9 +17,9 @@ public class SolrStoreTest { public void testGetSolrDocFromTileSummary() { SolrStore solrStore = new SolrStore(null); - NexusContent.TileSummary tileSummary = NexusContent.TileSummary.newBuilder() + TileSummary tileSummary = TileSummary.newBuilder() .setTileId("1") - .setBbox(NexusContent.TileSummary.BBox.newBuilder() + .setBbox(TileSummary.BBox.newBuilder() .setLatMin(51) .setLatMax(55) .setLonMin(22) @@ -30,7 +30,7 @@ public class SolrStoreTest { .setDataVarName("sst") .setGranule("test.nc") .setSectionSpec("0:1,0:1") - .setStats(NexusContent.TileSummary.DataStats.newBuilder() + .setStats(TileSummary.DataStats.newBuilder() .setCount(10) .setMax(50) .setMin(50) @@ -67,8 +67,8 @@ public class SolrStoreTest { public void testGeoIsPointWhenLatMinMaxEqualAndLonMinMaxEqual() { SolrStore solrStore = new SolrStore(null); - NexusContent.TileSummary tileSummary = NexusContent.TileSummary.newBuilder() - .setBbox(NexusContent.TileSummary.BBox.newBuilder() + TileSummary tileSummary = TileSummary.newBuilder() + .setBbox(TileSummary.BBox.newBuilder() .setLatMin(51) .setLatMax(51) .setLonMin(22) @@ -85,8 +85,8 @@ public class SolrStoreTest { public void testGeoIsLineStringWhenLatMinMaxEqualAndLonMinMaxNotEqual() { SolrStore solrStore = new SolrStore(null); - NexusContent.TileSummary tileSummary = NexusContent.TileSummary.newBuilder() - .setBbox(NexusContent.TileSummary.BBox.newBuilder() + TileSummary tileSummary = TileSummary.newBuilder() + .setBbox(TileSummary.BBox.newBuilder() .setLatMin(51) .setLatMax(51) .setLonMin(22) @@ -103,8 +103,8 @@ public class SolrStoreTest { public void testGeoIsLineStringWhenLatMinMaxNotEqualAndLonMinMaxEqual() { SolrStore solrStore = new SolrStore(null); - NexusContent.TileSummary tileSummary = NexusContent.TileSummary.newBuilder() - .setBbox(NexusContent.TileSummary.BBox.newBuilder() + TileSummary tileSummary = TileSummary.newBuilder() + .setBbox(TileSummary.BBox.newBuilder() .setLatMin(51) .setLatMax(59) .setLonMin(22) @@ -121,8 +121,8 @@ public class SolrStoreTest { public void testGeoIsLineStringWhenLatMinMaxAlmostEqualAndLonMinMaxNotEqual() { SolrStore solrStore = new SolrStore(null); - NexusContent.TileSummary tileSummary = NexusContent.TileSummary.newBuilder() - .setBbox(NexusContent.TileSummary.BBox.newBuilder() + TileSummary tileSummary = TileSummary.newBuilder() + .setBbox(TileSummary.BBox.newBuilder() .setLatMin(-56.135883f) .setLatMax(-56.135674f) .setLonMin(-9.229431f)
