From 6a2d38427f368bbd4b1a18d2d1dd25b7a7d2be97 Mon Sep 17 00:00:00 2001 From: Nathanael Jourdane Date: Tue, 17 May 2016 17:33:05 +0200 Subject: [PATCH] Use getters and setters for Granule. --- src/main/java/eu/omp/irap/vespa/epntapclient/granule/Granule.java | 1280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------- src/main/java/eu/omp/irap/vespa/epntapclient/granule/GranuleCtrl.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------- src/test/java/eu/omp/irap/vespa/epntapclient/EpnTapConnectionTest.java | 12 ++++++------ 3 files changed, 1282 insertions(+), 166 deletions(-) diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/granule/Granule.java b/src/main/java/eu/omp/irap/vespa/epntapclient/granule/Granule.java index 26c2b4d..f4ddf17 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/granule/Granule.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/granule/Granule.java @@ -24,260 +24,260 @@ import java.util.Date; public class Granule { /** Internal table row index. Unique ID in data service, also in v2. Can be alphanum. */ - public String granuleUid; + private String granuleUid; /** * Common to granules of same type (e.g. same map projection, or geometry data products). Can be * alphanum. */ - public String granuleGid; + private String granuleGid; /** * Associates granules derived from the same data (e.g. various representations / processing * levels). Can be alphanum., may be the ID of original observation. */ - public String obsId; + private String obsId; /** Organization of the data product, from enumerated list. */ - public String dataproductType; + private String dataproductType; /** Standard IAU name of target (from a list related to target class), case sensitive. */ - public String targetName; + private String targetName; /** Type of target, from enumerated list. */ - public String targetClass; + private String targetClass; /** * Acquisition start time (in JD). UTC measured at time_origin location (default is observer's * frame) */ - public Double timeMin; + private Double timeMin; /** * Acquisition stop time (in JD). UTC measured at time_origin location (default is observer's * frame). */ - public Double timeMax; + private Double timeMax; /** Min time sampling step. */ - public Double timeSamplingStepMin; + private Double timeSamplingStepMin; /** Max time sampling step. */ - public Double timeSamplingStepMax; + private Double timeSamplingStepMax; /** Min integration time. */ - public Double timeExpMin; + private Double timeExpMin; /** Max integration time. */ - public Double timeExpMax; + private Double timeExpMax; /** Min spectral range (frequency). */ - public Double spectralRangeMin; + private Double spectralRangeMin; /** Max spectral range (frequency). */ - public Double spectralRangeMax; + private Double spectralRangeMax; /** Min spectral sampling step. */ - public Double spectralSamplingStepMin; + private Double spectralSamplingStepMin; /** Max spectral sampling step. */ - public Double spectralSamplingStepMax; + private Double spectralSamplingStepMax; /** Min spectral resolution. */ - public Double spectralResolutionMin; + private Double spectralResolutionMin; /** Max spectral resolution. */ - public Double spectralResolutionMax; + private Double spectralResolutionMax; /** Min of first coordinate. */ - public Double c1Min; + private Double c1Min; /** Max of first coordinate. */ - public Double c1Max; + private Double c1Max; /** Min of second coordinate. */ - public Double c2Min; + private Double c2Min; /** Max of second coordinate. */ - public Double c2Max; + private Double c2Max; /** Min of third coordinate. */ - public Double c3Min; + private Double c3Min; /** Max of third coordinate. */ - public Double c3Max; + private Double c3Max; /** ObsCore-like footprint, assume spatial_coordinate_description. */ - public String sRegion; + private String sRegion; /** Min resolution in first coordinate. */ - public Double c1ResolMin; + private Double c1ResolMin; /** Max resolution in first coordinate. */ - public Double c1ResolMax; + private Double c1ResolMax; /** Min resolution in second coordinate. */ - public Double c2ResolMin; + private Double c2ResolMin; /** Max resolution in second coordinate. */ - public Double c2ResolMax; + private Double c2ResolMax; /** Min resolution in third coordinate. */ - public Double c3ResolMin; + private Double c3ResolMin; /** Max resolution in third coordinate. */ - public Double c3ResolMax; + private Double c3ResolMax; /** Flavor of coordinate system, defines the nature of coordinates. From enumerated list. */ - public String spatialFrameType; + private String spatialFrameType; /** Min incidence angle (solar zenithal angle). */ - public Double incidenceMin; + private Double incidenceMin; /** Max incidence angle (solar zenithal angle). */ - public Double incidenceMax; + private Double incidenceMax; /** Min emergence angle. */ - public Double emergenceMin; + private Double emergenceMin; /** Max emergence angle. */ - public Double emergenceMax; + private Double emergenceMax; /** Min phase angle. */ - public Double phaseMin; + private Double phaseMin; /** Max phase angle. */ - public Double phaseMax; + private Double phaseMax; /** Standard name of the observatory or spacecraft. */ - public String instrumentHostName; + private String instrumentHostName; /** Standard name of instrument */ - public String instrumentName; + private String instrumentName; /** UCD(s) defining the data */ - public String measurementType; + private String measurementType; /** CODMAC calibration level in v1 */ - public Integer processingLevel; + private Integer processingLevel; /** Date of first entry of this granule */ - public Date creationDate; + private Date creationDate; /** Date of last modification (used to handle mirroring) */ - public Date modificationDate; + private Date modificationDate; /** */ - public Date releaseDate; + private Date releaseDate; /** */ - public String serviceTitle; + private String serviceTitle; /** */ - public String accessUrl; + private String accessUrl; /** */ - public String accessFormat; + private String accessFormat; /** Estimate file size in kbyte (with this spelling) */ - public int accessEstsize; + private int accessEstsize; /** * If access_format indicates a detached label, this parameter is mandatory and points to the * corresponding data file - both will be handled by the client before samping it to tools or * downloading */ - public String dataAccessUrl; + private String dataAccessUrl; /** MD5 Hash for the file when available (real file) */ - public String accessMd5; + private String accessMd5; /** URL of a thumbnail image with predefined size (png ~200 pix, for use in a client only) */ - public String thumbnailUrl; + private String thumbnailUrl; /** Name of the data file only, case sensitive */ - public String fileName; + private String fileName; /** Identifies a chemical species, case sensitive */ - public String species; + private String species; /** Provides alternative target name if more common (e.g. comets) */ - public String altTargetName; + private String altTargetName; /** */ - public String targetRegion; + private String targetRegion; /** */ - public String featureName; + private String featureName; /** Bibcode, doi, or other biblio id, URL */ - public String bibReference; + private String bibReference; /** */ - public double ra; + private double ra; /** Declination */ - public double dec; + private double dec; /** Min Solar longitude Ls (location on orbit / season) */ - public double solarLongitudeMin; + private double solarLongitudeMin; /** Max Solar longitude Ls (location on orbit / season) */ - public double solarLongitudeMax; + private double solarLongitudeMax; /** Local time at observed region */ - public double localTimeMin; + private double localTimeMin; /** Local time at observed region */ - public double localTimeMax; + private double localTimeMax; /** Observer-target distance */ - public double targetDistanceMin; + private double targetDistanceMin; /** Observer-target distance */ - public double targetDistanceMax; + private double targetDistanceMax; /** */ - public double targetTimeMin; + private double targetTimeMin; /** */ - public double targetTimeMax; + private double targetTimeMax; /** */ - public String particleSpectralType; + private String particleSpectralType; /** */ - public double particleSpectralRangeMin; + private double particleSpectralRangeMin; /** */ - public double particleSpectralRangeMax; + private double particleSpectralRangeMax; /** */ - public double particleSpectralSamplingStepMin; + private double particleSpectralSamplingStepMin; /** */ - public double particleSpectralSamplingStepMax; + private double particleSpectralSamplingStepMax; /** */ - public double particleSpectralResolutionMin; + private double particleSpectralResolutionMin; /** */ - public double particleSpectralResolutionMax; + private double particleSpectralResolutionMax; /** Resource publisher */ - public String publisher; + private String publisher; /** ID of specific coordinate system and version */ - public String spatialCoordinateDescription; + private String spatialCoordinateDescription; /** Defines the frame origin */ - public String spatialOrigin; + private String spatialOrigin; /** */ - public String timeOrigin; + private String timeOrigin; /** */ - public String timeScale; + private String timeScale; /** Private constructor to hide the default public one. */ @@ -294,6 +294,1126 @@ public class Granule { } /** + * @return the granuleUid + */ + public String getGranuleUid() { + return granuleUid; + } + + /** + * @param granuleUid the granuleUid to set + */ + public void setGranuleUid(String granuleUid) { + this.granuleUid = granuleUid; + } + + /** + * @return the granuleGid + */ + public String getGranuleGid() { + return granuleGid; + } + + /** + * @param granuleGid the granuleGid to set + */ + public void setGranuleGid(String granuleGid) { + this.granuleGid = granuleGid; + } + + /** + * @return the obsId + */ + public String getObsId() { + return obsId; + } + + /** + * @param obsId the obsId to set + */ + public void setObsId(String obsId) { + this.obsId = obsId; + } + + /** + * @return the dataproductType + */ + public String getDataproductType() { + return dataproductType; + } + + /** + * @param dataproductType the dataproductType to set + */ + public void setDataproductType(String dataproductType) { + this.dataproductType = dataproductType; + } + + /** + * @return the targetName + */ + public String getTargetName() { + return targetName; + } + + /** + * @param targetName the targetName to set + */ + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + /** + * @return the targetClass + */ + public String getTargetClass() { + return targetClass; + } + + /** + * @param targetClass the targetClass to set + */ + public void setTargetClass(String targetClass) { + this.targetClass = targetClass; + } + + /** + * @return the timeMin + */ + public Double getTimeMin() { + return timeMin; + } + + /** + * @param timeMin the timeMin to set + */ + public void setTimeMin(Double timeMin) { + this.timeMin = timeMin; + } + + /** + * @return the timeMax + */ + public Double getTimeMax() { + return timeMax; + } + + /** + * @param timeMax the timeMax to set + */ + public void setTimeMax(Double timeMax) { + this.timeMax = timeMax; + } + + /** + * @return the timeSamplingStepMin + */ + public Double getTimeSamplingStepMin() { + return timeSamplingStepMin; + } + + /** + * @param timeSamplingStepMin the timeSamplingStepMin to set + */ + public void setTimeSamplingStepMin(Double timeSamplingStepMin) { + this.timeSamplingStepMin = timeSamplingStepMin; + } + + /** + * @return the timeSamplingStepMax + */ + public Double getTimeSamplingStepMax() { + return timeSamplingStepMax; + } + + /** + * @param timeSamplingStepMax the timeSamplingStepMax to set + */ + public void setTimeSamplingStepMax(Double timeSamplingStepMax) { + this.timeSamplingStepMax = timeSamplingStepMax; + } + + /** + * @return the timeExpMin + */ + public Double getTimeExpMin() { + return timeExpMin; + } + + /** + * @param timeExpMin the timeExpMin to set + */ + public void setTimeExpMin(Double timeExpMin) { + this.timeExpMin = timeExpMin; + } + + /** + * @return the timeExpMax + */ + public Double getTimeExpMax() { + return timeExpMax; + } + + /** + * @param timeExpMax the timeExpMax to set + */ + public void setTimeExpMax(Double timeExpMax) { + this.timeExpMax = timeExpMax; + } + + /** + * @return the spectralRangeMin + */ + public Double getSpectralRangeMin() { + return spectralRangeMin; + } + + /** + * @param spectralRangeMin the spectralRangeMin to set + */ + public void setSpectralRangeMin(Double spectralRangeMin) { + this.spectralRangeMin = spectralRangeMin; + } + + /** + * @return the spectralRangeMax + */ + public Double getSpectralRangeMax() { + return spectralRangeMax; + } + + /** + * @param spectralRangeMax the spectralRangeMax to set + */ + public void setSpectralRangeMax(Double spectralRangeMax) { + this.spectralRangeMax = spectralRangeMax; + } + + /** + * @return the spectralSamplingStepMin + */ + public Double getSpectralSamplingStepMin() { + return spectralSamplingStepMin; + } + + /** + * @param spectralSamplingStepMin the spectralSamplingStepMin to set + */ + public void setSpectralSamplingStepMin(Double spectralSamplingStepMin) { + this.spectralSamplingStepMin = spectralSamplingStepMin; + } + + /** + * @return the spectralSamplingStepMax + */ + public Double getSpectralSamplingStepMax() { + return spectralSamplingStepMax; + } + + /** + * @param spectralSamplingStepMax the spectralSamplingStepMax to set + */ + public void setSpectralSamplingStepMax(Double spectralSamplingStepMax) { + this.spectralSamplingStepMax = spectralSamplingStepMax; + } + + /** + * @return the spectralResolutionMin + */ + public Double getSpectralResolutionMin() { + return spectralResolutionMin; + } + + /** + * @param spectralResolutionMin the spectralResolutionMin to set + */ + public void setSpectralResolutionMin(Double spectralResolutionMin) { + this.spectralResolutionMin = spectralResolutionMin; + } + + /** + * @return the spectralResolutionMax + */ + public Double getSpectralResolutionMax() { + return spectralResolutionMax; + } + + /** + * @param spectralResolutionMax the spectralResolutionMax to set + */ + public void setSpectralResolutionMax(Double spectralResolutionMax) { + this.spectralResolutionMax = spectralResolutionMax; + } + + /** + * @return the c1Min + */ + public Double getC1Min() { + return c1Min; + } + + /** + * @param c1Min the c1Min to set + */ + public void setC1Min(Double c1Min) { + this.c1Min = c1Min; + } + + /** + * @return the c1Max + */ + public Double getC1Max() { + return c1Max; + } + + /** + * @param c1Max the c1Max to set + */ + public void setC1Max(Double c1Max) { + this.c1Max = c1Max; + } + + /** + * @return the c2Min + */ + public Double getC2Min() { + return c2Min; + } + + /** + * @param c2Min the c2Min to set + */ + public void setC2Min(Double c2Min) { + this.c2Min = c2Min; + } + + /** + * @return the c2Max + */ + public Double getC2Max() { + return c2Max; + } + + /** + * @param c2Max the c2Max to set + */ + public void setC2Max(Double c2Max) { + this.c2Max = c2Max; + } + + /** + * @return the c3Min + */ + public Double getC3Min() { + return c3Min; + } + + /** + * @param c3Min the c3Min to set + */ + public void setC3Min(Double c3Min) { + this.c3Min = c3Min; + } + + /** + * @return the c3Max + */ + public Double getC3Max() { + return c3Max; + } + + /** + * @param c3Max the c3Max to set + */ + public void setC3Max(Double c3Max) { + this.c3Max = c3Max; + } + + /** + * @return the sRegion + */ + public String getsRegion() { + return sRegion; + } + + /** + * @param sRegion the sRegion to set + */ + public void setsRegion(String sRegion) { + this.sRegion = sRegion; + } + + /** + * @return the c1ResolMin + */ + public Double getC1ResolMin() { + return c1ResolMin; + } + + /** + * @param c1ResolMin the c1ResolMin to set + */ + public void setC1ResolMin(Double c1ResolMin) { + this.c1ResolMin = c1ResolMin; + } + + /** + * @return the c1ResolMax + */ + public Double getC1ResolMax() { + return c1ResolMax; + } + + /** + * @param c1ResolMax the c1ResolMax to set + */ + public void setC1ResolMax(Double c1ResolMax) { + this.c1ResolMax = c1ResolMax; + } + + /** + * @return the c2ResolMin + */ + public Double getC2ResolMin() { + return c2ResolMin; + } + + /** + * @param c2ResolMin the c2ResolMin to set + */ + public void setC2ResolMin(Double c2ResolMin) { + this.c2ResolMin = c2ResolMin; + } + + /** + * @return the c2ResolMax + */ + public Double getC2ResolMax() { + return c2ResolMax; + } + + /** + * @param c2ResolMax the c2ResolMax to set + */ + public void setC2ResolMax(Double c2ResolMax) { + this.c2ResolMax = c2ResolMax; + } + + /** + * @return the c3ResolMin + */ + public Double getC3ResolMin() { + return c3ResolMin; + } + + /** + * @param c3ResolMin the c3ResolMin to set + */ + public void setC3ResolMin(Double c3ResolMin) { + this.c3ResolMin = c3ResolMin; + } + + /** + * @return the c3ResolMax + */ + public Double getC3ResolMax() { + return c3ResolMax; + } + + /** + * @param c3ResolMax the c3ResolMax to set + */ + public void setC3ResolMax(Double c3ResolMax) { + this.c3ResolMax = c3ResolMax; + } + + /** + * @return the spatialFrameType + */ + public String getSpatialFrameType() { + return spatialFrameType; + } + + /** + * @param spatialFrameType the spatialFrameType to set + */ + public void setSpatialFrameType(String spatialFrameType) { + this.spatialFrameType = spatialFrameType; + } + + /** + * @return the incidenceMin + */ + public Double getIncidenceMin() { + return incidenceMin; + } + + /** + * @param incidenceMin the incidenceMin to set + */ + public void setIncidenceMin(Double incidenceMin) { + this.incidenceMin = incidenceMin; + } + + /** + * @return the incidenceMax + */ + public Double getIncidenceMax() { + return incidenceMax; + } + + /** + * @param incidenceMax the incidenceMax to set + */ + public void setIncidenceMax(Double incidenceMax) { + this.incidenceMax = incidenceMax; + } + + /** + * @return the emergenceMin + */ + public Double getEmergenceMin() { + return emergenceMin; + } + + /** + * @param emergenceMin the emergenceMin to set + */ + public void setEmergenceMin(Double emergenceMin) { + this.emergenceMin = emergenceMin; + } + + /** + * @return the emergenceMax + */ + public Double getEmergenceMax() { + return emergenceMax; + } + + /** + * @param emergenceMax the emergenceMax to set + */ + public void setEmergenceMax(Double emergenceMax) { + this.emergenceMax = emergenceMax; + } + + /** + * @return the phaseMin + */ + public Double getPhaseMin() { + return phaseMin; + } + + /** + * @param phaseMin the phaseMin to set + */ + public void setPhaseMin(Double phaseMin) { + this.phaseMin = phaseMin; + } + + /** + * @return the phaseMax + */ + public Double getPhaseMax() { + return phaseMax; + } + + /** + * @param phaseMax the phaseMax to set + */ + public void setPhaseMax(Double phaseMax) { + this.phaseMax = phaseMax; + } + + /** + * @return the instrumentHostName + */ + public String getInstrumentHostName() { + return instrumentHostName; + } + + /** + * @param instrumentHostName the instrumentHostName to set + */ + public void setInstrumentHostName(String instrumentHostName) { + this.instrumentHostName = instrumentHostName; + } + + /** + * @return the instrumentName + */ + public String getInstrumentName() { + return instrumentName; + } + + /** + * @param instrumentName the instrumentName to set + */ + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; + } + + /** + * @return the measurementType + */ + public String getMeasurementType() { + return measurementType; + } + + /** + * @param measurementType the measurementType to set + */ + public void setMeasurementType(String measurementType) { + this.measurementType = measurementType; + } + + /** + * @return the processingLevel + */ + public Integer getProcessingLevel() { + return processingLevel; + } + + /** + * @param processingLevel the processingLevel to set + */ + public void setProcessingLevel(Integer processingLevel) { + this.processingLevel = processingLevel; + } + + /** + * @return the creationDate + */ + public Date getCreationDate() { + return creationDate; + } + + /** + * @param creationDate the creationDate to set + */ + public void setCreationDate(Date creationDate) { + this.creationDate = creationDate; + } + + /** + * @return the modificationDate + */ + public Date getModificationDate() { + return modificationDate; + } + + /** + * @param modificationDate the modificationDate to set + */ + public void setModificationDate(Date modificationDate) { + this.modificationDate = modificationDate; + } + + /** + * @return the releaseDate + */ + public Date getReleaseDate() { + return releaseDate; + } + + /** + * @param releaseDate the releaseDate to set + */ + public void setReleaseDate(Date releaseDate) { + this.releaseDate = releaseDate; + } + + /** + * @return the serviceTitle + */ + public String getServiceTitle() { + return serviceTitle; + } + + /** + * @param serviceTitle the serviceTitle to set + */ + public void setServiceTitle(String serviceTitle) { + this.serviceTitle = serviceTitle; + } + + /** + * @return the accessUrl + */ + public String getAccessUrl() { + return accessUrl; + } + + /** + * @param accessUrl the accessUrl to set + */ + public void setAccessUrl(String accessUrl) { + this.accessUrl = accessUrl; + } + + /** + * @return the accessFormat + */ + public String getAccessFormat() { + return accessFormat; + } + + /** + * @param accessFormat the accessFormat to set + */ + public void setAccessFormat(String accessFormat) { + this.accessFormat = accessFormat; + } + + /** + * @return the accessEstsize + */ + public int getAccessEstsize() { + return accessEstsize; + } + + /** + * @param accessEstsize the accessEstsize to set + */ + public void setAccessEstsize(int accessEstsize) { + this.accessEstsize = accessEstsize; + } + + /** + * @return the dataAccessUrl + */ + public String getDataAccessUrl() { + return dataAccessUrl; + } + + /** + * @param dataAccessUrl the dataAccessUrl to set + */ + public void setDataAccessUrl(String dataAccessUrl) { + this.dataAccessUrl = dataAccessUrl; + } + + /** + * @return the accessMd5 + */ + public String getAccessMd5() { + return accessMd5; + } + + /** + * @param accessMd5 the accessMd5 to set + */ + public void setAccessMd5(String accessMd5) { + this.accessMd5 = accessMd5; + } + + /** + * @return the thumbnailUrl + */ + public String getThumbnailUrl() { + return thumbnailUrl; + } + + /** + * @param thumbnailUrl the thumbnailUrl to set + */ + public void setThumbnailUrl(String thumbnailUrl) { + this.thumbnailUrl = thumbnailUrl; + } + + /** + * @return the fileName + */ + public String getFileName() { + return fileName; + } + + /** + * @param fileName the fileName to set + */ + public void setFileName(String fileName) { + this.fileName = fileName; + } + + /** + * @return the species + */ + public String getSpecies() { + return species; + } + + /** + * @param species the species to set + */ + public void setSpecies(String species) { + this.species = species; + } + + /** + * @return the altTargetName + */ + public String getAltTargetName() { + return altTargetName; + } + + /** + * @param altTargetName the altTargetName to set + */ + public void setAltTargetName(String altTargetName) { + this.altTargetName = altTargetName; + } + + /** + * @return the targetRegion + */ + public String getTargetRegion() { + return targetRegion; + } + + /** + * @param targetRegion the targetRegion to set + */ + public void setTargetRegion(String targetRegion) { + this.targetRegion = targetRegion; + } + + /** + * @return the featureName + */ + public String getFeatureName() { + return featureName; + } + + /** + * @param featureName the featureName to set + */ + public void setFeatureName(String featureName) { + this.featureName = featureName; + } + + /** + * @return the bibReference + */ + public String getBibReference() { + return bibReference; + } + + /** + * @param bibReference the bibReference to set + */ + public void setBibReference(String bibReference) { + this.bibReference = bibReference; + } + + /** + * @return the ra + */ + public double getRa() { + return ra; + } + + /** + * @param ra the ra to set + */ + public void setRa(double ra) { + this.ra = ra; + } + + /** + * @return the dec + */ + public double getDec() { + return dec; + } + + /** + * @param dec the dec to set + */ + public void setDec(double dec) { + this.dec = dec; + } + + /** + * @return the solarLongitudeMin + */ + public double getSolarLongitudeMin() { + return solarLongitudeMin; + } + + /** + * @param solarLongitudeMin the solarLongitudeMin to set + */ + public void setSolarLongitudeMin(double solarLongitudeMin) { + this.solarLongitudeMin = solarLongitudeMin; + } + + /** + * @return the solarLongitudeMax + */ + public double getSolarLongitudeMax() { + return solarLongitudeMax; + } + + /** + * @param solarLongitudeMax the solarLongitudeMax to set + */ + public void setSolarLongitudeMax(double solarLongitudeMax) { + this.solarLongitudeMax = solarLongitudeMax; + } + + /** + * @return the localTimeMin + */ + public double getLocalTimeMin() { + return localTimeMin; + } + + /** + * @param localTimeMin the localTimeMin to set + */ + public void setLocalTimeMin(double localTimeMin) { + this.localTimeMin = localTimeMin; + } + + /** + * @return the localTimeMax + */ + public double getLocalTimeMax() { + return localTimeMax; + } + + /** + * @param localTimeMax the localTimeMax to set + */ + public void setLocalTimeMax(double localTimeMax) { + this.localTimeMax = localTimeMax; + } + + /** + * @return the targetDistanceMin + */ + public double getTargetDistanceMin() { + return targetDistanceMin; + } + + /** + * @param targetDistanceMin the targetDistanceMin to set + */ + public void setTargetDistanceMin(double targetDistanceMin) { + this.targetDistanceMin = targetDistanceMin; + } + + /** + * @return the targetDistanceMax + */ + public double getTargetDistanceMax() { + return targetDistanceMax; + } + + /** + * @param targetDistanceMax the targetDistanceMax to set + */ + public void setTargetDistanceMax(double targetDistanceMax) { + this.targetDistanceMax = targetDistanceMax; + } + + /** + * @return the targetTimeMin + */ + public double getTargetTimeMin() { + return targetTimeMin; + } + + /** + * @param targetTimeMin the targetTimeMin to set + */ + public void setTargetTimeMin(double targetTimeMin) { + this.targetTimeMin = targetTimeMin; + } + + /** + * @return the targetTimeMax + */ + public double getTargetTimeMax() { + return targetTimeMax; + } + + /** + * @param targetTimeMax the targetTimeMax to set + */ + public void setTargetTimeMax(double targetTimeMax) { + this.targetTimeMax = targetTimeMax; + } + + /** + * @return the particleSpectralType + */ + public String getParticleSpectralType() { + return particleSpectralType; + } + + /** + * @param particleSpectralType the particleSpectralType to set + */ + public void setParticleSpectralType(String particleSpectralType) { + this.particleSpectralType = particleSpectralType; + } + + /** + * @return the particleSpectralRangeMin + */ + public double getParticleSpectralRangeMin() { + return particleSpectralRangeMin; + } + + /** + * @param particleSpectralRangeMin the particleSpectralRangeMin to set + */ + public void setParticleSpectralRangeMin(double particleSpectralRangeMin) { + this.particleSpectralRangeMin = particleSpectralRangeMin; + } + + /** + * @return the particleSpectralRangeMax + */ + public double getParticleSpectralRangeMax() { + return particleSpectralRangeMax; + } + + /** + * @param particleSpectralRangeMax the particleSpectralRangeMax to set + */ + public void setParticleSpectralRangeMax(double particleSpectralRangeMax) { + this.particleSpectralRangeMax = particleSpectralRangeMax; + } + + /** + * @return the particleSpectralSamplingStepMin + */ + public double getParticleSpectralSamplingStepMin() { + return particleSpectralSamplingStepMin; + } + + /** + * @param particleSpectralSamplingStepMin the particleSpectralSamplingStepMin to set + */ + public void setParticleSpectralSamplingStepMin(double particleSpectralSamplingStepMin) { + this.particleSpectralSamplingStepMin = particleSpectralSamplingStepMin; + } + + /** + * @return the particleSpectralSamplingStepMax + */ + public double getParticleSpectralSamplingStepMax() { + return particleSpectralSamplingStepMax; + } + + /** + * @param particleSpectralSamplingStepMax the particleSpectralSamplingStepMax to set + */ + public void setParticleSpectralSamplingStepMax(double particleSpectralSamplingStepMax) { + this.particleSpectralSamplingStepMax = particleSpectralSamplingStepMax; + } + + /** + * @return the particleSpectralResolutionMin + */ + public double getParticleSpectralResolutionMin() { + return particleSpectralResolutionMin; + } + + /** + * @param particleSpectralResolutionMin the particleSpectralResolutionMin to set + */ + public void setParticleSpectralResolutionMin(double particleSpectralResolutionMin) { + this.particleSpectralResolutionMin = particleSpectralResolutionMin; + } + + /** + * @return the particleSpectralResolutionMax + */ + public double getParticleSpectralResolutionMax() { + return particleSpectralResolutionMax; + } + + /** + * @param particleSpectralResolutionMax the particleSpectralResolutionMax to set + */ + public void setParticleSpectralResolutionMax(double particleSpectralResolutionMax) { + this.particleSpectralResolutionMax = particleSpectralResolutionMax; + } + + /** + * @return the publisher + */ + public String getPublisher() { + return publisher; + } + + /** + * @param publisher the publisher to set + */ + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + /** + * @return the spatialCoordinateDescription + */ + public String getSpatialCoordinateDescription() { + return spatialCoordinateDescription; + } + + /** + * @param spatialCoordinateDescription the spatialCoordinateDescription to set + */ + public void setSpatialCoordinateDescription(String spatialCoordinateDescription) { + this.spatialCoordinateDescription = spatialCoordinateDescription; + } + + /** + * @return the spatialOrigin + */ + public String getSpatialOrigin() { + return spatialOrigin; + } + + /** + * @param spatialOrigin the spatialOrigin to set + */ + public void setSpatialOrigin(String spatialOrigin) { + this.spatialOrigin = spatialOrigin; + } + + /** + * @return the timeOrigin + */ + public String getTimeOrigin() { + return timeOrigin; + } + + /** + * @param timeOrigin the timeOrigin to set + */ + public void setTimeOrigin(String timeOrigin) { + this.timeOrigin = timeOrigin; + } + + /** + * @return the timeScale + */ + public String getTimeScale() { + return timeScale; + } + + /** + * @param timeScale the timeScale to set + */ + public void setTimeScale(String timeScale) { + this.timeScale = timeScale; + } + + /** * A granule is valid if all mandatory parameters are filled. * * @return true if the Granule is valid, false otherwise. diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/granule/GranuleCtrl.java b/src/main/java/eu/omp/irap/vespa/epntapclient/granule/GranuleCtrl.java index 0386a89..f49b953 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/granule/GranuleCtrl.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/granule/GranuleCtrl.java @@ -21,9 +21,9 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.logging.Level; import java.util.logging.Logger; -import eu.omp.irap.vespa.votable.utils.Debug; import eu.omp.irap.vespa.votable.votabledata.VOTableData; /** @@ -36,106 +36,44 @@ public class GranuleCtrl { private VOTableData data; + private static final String ERROR_MSG = "%s not found in the rowId %s: return %s."; + public GranuleCtrl(VOTableData data) { this.data = data; } - private String parseString(int rowId, GranuleEnum granuleEnum) { + private String parseString(int rowId, GranuleEnum granule) { String res = ""; try { - res = (String) data.getCell(rowId, granuleEnum.toString()); + res = (String) data.getCell(rowId, granule.toString()); } catch (Exception e) { - logger.warning(granuleEnum + "not found in the rowId" + rowId + - ": return an empty string"); + logger.log(Level.WARNING, String.format(ERROR_MSG, granule, rowId, "empty string"), e); } return res; } - private Date parseDate(int rowId, GranuleEnum granuleEnum) throws ParseException { + private Date parseDate(int rowId, GranuleEnum granule) throws ParseException { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd"); Date date = new Date(); try { - date = sdf.parse((String) data.getCell(rowId, granuleEnum.toString())); + date = sdf.parse((String) data.getCell(rowId, granule.toString())); } catch (Exception e) { - logger.warning(granuleEnum + "not found in the rowId" + rowId + - ": return an empty Date"); + logger.log(Level.WARNING, String.format(ERROR_MSG, granule, rowId, "empty date"), e); } - + return date; } - private Double parseDouble(int rowId, GranuleEnum granuleEnum) { + private Double parseDouble(int rowId, GranuleEnum granule) { Double d = null; try { - d = (Double) data.getCell(rowId, granuleEnum.toString()); + d = (Double) data.getCell(rowId, granule.toString()); } catch (Exception e) { - logger.warning(granuleEnum + "not found in the rowId" + rowId + - ": return a Double.NaN"); + logger.log(Level.WARNING, String.format(ERROR_MSG, granule, rowId, "double.NaN"), e); } - - return d == null ? Double.NaN : d; - } - public Granule getGranuleFromVOTableRow(int rowId) throws ParseException { - - // TODO: parser colonne par colonne pour éviter de faire des comparer les noms de colone à - // chaque ligne. - Debug.writeObject("data", data); - - //@noformat - Granule g = new Granule(parseString(rowId, GranuleEnum.GRANULE_UID)); - g.granuleGid = parseString(rowId, GranuleEnum.GRANULE_GID); - g.obsId = parseString(rowId, GranuleEnum.OBS_ID); - g.dataproductType = parseString(rowId, GranuleEnum.DATAPRODUCT_TYPE); - g.targetName = parseString(rowId, GranuleEnum.TARGET_NAME); - g.targetClass = parseString(rowId, GranuleEnum.TARGET_CLASS); - g.timeMin = parseDouble(rowId, GranuleEnum.TIME_MIN); - g.timeMax = parseDouble(rowId, GranuleEnum.TIME_MAX); - g.timeSamplingStepMin = parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MIN); - g.timeSamplingStepMax = parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MAX); - g.timeExpMin = parseDouble(rowId, GranuleEnum.TIME_EXP_MIN); - g.timeExpMax = parseDouble(rowId, GranuleEnum.TIME_EXP_MAX); - g.spectralRangeMin = parseDouble(rowId, GranuleEnum.SPECTRAL_RANGE_MIN); - g.spectralRangeMax = parseDouble(rowId, GranuleEnum.SPECTRAL_RANGE_MAX); - g.timeSamplingStepMin = parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MIN); - g.timeSamplingStepMax = parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MAX); - g.spectralResolutionMin = parseDouble(rowId, GranuleEnum.SPECTRAL_RESOLUTION_MIN); - g.spectralResolutionMax = parseDouble(rowId, GranuleEnum.SPECTRAL_RESOLUTION_MAX); - g.c1Min = parseDouble(rowId, GranuleEnum.C1MIN); - g.c1Max = parseDouble(rowId, GranuleEnum.C1MAX); - g.c2Min = parseDouble(rowId, GranuleEnum.C2MIN); - g.c2Max = parseDouble(rowId, GranuleEnum.C2MAX); - g.c3Min = parseDouble(rowId, GranuleEnum.C3MIN); - g.c3Max = parseDouble(rowId, GranuleEnum.C3MAX); - g.sRegion = parseString(rowId, GranuleEnum.S_REGION); - g.c1ResolMin = parseDouble(rowId, GranuleEnum.C1_RESOL_MIN); - g.c1ResolMax = parseDouble(rowId, GranuleEnum.C1_RESOL_MAX); - g.c2ResolMin = parseDouble(rowId, GranuleEnum.C2_RESOL_MIN); - g.c2ResolMax = parseDouble(rowId, GranuleEnum.C2_RESOL_MAX); - g.c3ResolMin = parseDouble(rowId, GranuleEnum.C3_RESOL_MIN); - g.c3ResolMax = parseDouble(rowId, GranuleEnum.C3_RESOL_MAX); - g.spatialFrameType = parseString(rowId, GranuleEnum.SPATIAL_FRAME_TYPE); - g.incidenceMin = parseDouble(rowId, GranuleEnum.INCIDENCE_MIN); - g.incidenceMax = parseDouble(rowId, GranuleEnum.INCIDENCE_MAX); - g.emergenceMin = parseDouble(rowId, GranuleEnum.EMERGENCE_MIN); - g.emergenceMax = parseDouble(rowId, GranuleEnum.EMERGENCE_MAX); - g.phaseMin = parseDouble(rowId, GranuleEnum.PHASE_MIN); - g.phaseMax = parseDouble(rowId, GranuleEnum.PHASE_MAX); - g.instrumentHostName = parseString(rowId, GranuleEnum.INSTRUMENT_HOST_NAME); - g.instrumentName = parseString(rowId, GranuleEnum.INSTRUMENT_NAME); - g.measurementType = parseString(rowId, GranuleEnum.MEASUREMENT_TYPE); - g.processingLevel = parseInteger(rowId); - g.creationDate = parseDate(rowId, GranuleEnum.CREATION_DATE); - g.modificationDate = parseDate(rowId, GranuleEnum.MODIFICATION_DATE) ; - g.releaseDate = parseDate(rowId, GranuleEnum.RELEASE_DATE) ; - g.serviceTitle = parseString(rowId, GranuleEnum.SERVICE_TITLE); - //@format - - if (!g.isValid()) { - throw new IllegalArgumentException("One or more EPN parameter is null."); - } - return g; + return d == null ? Double.NaN : d; } /** @@ -147,25 +85,83 @@ public class GranuleCtrl { try { val = (Integer) data.getCell(rowId, GranuleEnum.PROCESSING_LEVEL.toString()); } catch (Exception e) { - // TODO: handle exception + logger.log(Level.WARNING, GranuleEnum.PROCESSING_LEVEL.toString() + + " not found in the rowId " + rowId + ": return a Double.NaN", e); } return val; } + public Granule getGranuleFromVOTableRow(int rowId) throws ParseException { + + // TODO: Parse column by column, to avoid compare all column name for each line. + + //@noformat + Granule g = new Granule(parseString(rowId, GranuleEnum.GRANULE_UID)); + g.setGranuleGid(parseString(rowId, GranuleEnum.GRANULE_GID)); + g.setObsId(parseString(rowId, GranuleEnum.OBS_ID)); + g.setDataproductType(parseString(rowId, GranuleEnum.DATAPRODUCT_TYPE)); + g.setTargetName(parseString(rowId, GranuleEnum.TARGET_NAME)); + g.setTargetClass(parseString(rowId, GranuleEnum.TARGET_CLASS)); + g.setTimeMin(parseDouble(rowId, GranuleEnum.TIME_MIN)); + g.setTimeMax(parseDouble(rowId, GranuleEnum.TIME_MAX)); + g.setTimeSamplingStepMin(parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MIN)); + g.setTimeSamplingStepMax(parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MAX)); + g.setTimeExpMin(parseDouble(rowId, GranuleEnum.TIME_EXP_MIN)); + g.setTimeExpMax(parseDouble(rowId, GranuleEnum.TIME_EXP_MAX)); + g.setSpectralRangeMin(parseDouble(rowId, GranuleEnum.SPECTRAL_RANGE_MIN)); + g.setSpectralRangeMax(parseDouble(rowId, GranuleEnum.SPECTRAL_RANGE_MAX)); + g.setTimeSamplingStepMin(parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MIN)); + g.setTimeSamplingStepMax(parseDouble(rowId, GranuleEnum.TIME_SAMPLING_STEP_MAX)); + g.setSpectralResolutionMin(parseDouble(rowId, GranuleEnum.SPECTRAL_RESOLUTION_MIN)); + g.setSpectralResolutionMax(parseDouble(rowId, GranuleEnum.SPECTRAL_RESOLUTION_MAX)); + g.setC1Min(parseDouble(rowId, GranuleEnum.C1MIN)); + g.setC1Max(parseDouble(rowId, GranuleEnum.C1MAX)); + g.setC2Min(parseDouble(rowId, GranuleEnum.C2MIN)); + g.setC2Max(parseDouble(rowId, GranuleEnum.C2MAX)); + g.setC3Min(parseDouble(rowId, GranuleEnum.C3MIN)); + g.setC3Max(parseDouble(rowId, GranuleEnum.C3MAX)); + g.setsRegion(parseString(rowId, GranuleEnum.S_REGION)); + g.setC1ResolMin(parseDouble(rowId, GranuleEnum.C1_RESOL_MIN)); + g.setC1ResolMax(parseDouble(rowId, GranuleEnum.C1_RESOL_MAX)); + g.setC2ResolMin(parseDouble(rowId, GranuleEnum.C2_RESOL_MIN)); + g.setC2ResolMax(parseDouble(rowId, GranuleEnum.C2_RESOL_MAX)); + g.setC3ResolMin(parseDouble(rowId, GranuleEnum.C3_RESOL_MIN)); + g.setC3ResolMax(parseDouble(rowId, GranuleEnum.C3_RESOL_MAX)); + g.setSpatialFrameType(parseString(rowId, GranuleEnum.SPATIAL_FRAME_TYPE)); + g.setIncidenceMin(parseDouble(rowId, GranuleEnum.INCIDENCE_MIN)); + g.setIncidenceMax(parseDouble(rowId, GranuleEnum.INCIDENCE_MAX)); + g.setEmergenceMin(parseDouble(rowId, GranuleEnum.EMERGENCE_MIN)); + g.setEmergenceMax(parseDouble(rowId, GranuleEnum.EMERGENCE_MAX)); + g.setPhaseMin(parseDouble(rowId, GranuleEnum.PHASE_MIN)); + g.setPhaseMax(parseDouble(rowId, GranuleEnum.PHASE_MAX)); + g.setInstrumentHostName(parseString(rowId, GranuleEnum.INSTRUMENT_HOST_NAME)); + g.setInstrumentName(parseString(rowId, GranuleEnum.INSTRUMENT_NAME)); + g.setMeasurementType(parseString(rowId, GranuleEnum.MEASUREMENT_TYPE)); + g.setProcessingLevel(parseInteger(rowId)); + g.setCreationDate(parseDate(rowId, GranuleEnum.CREATION_DATE)); + g.setModificationDate(parseDate(rowId, GranuleEnum.MODIFICATION_DATE) ); + g.setReleaseDate(parseDate(rowId, GranuleEnum.RELEASE_DATE) ); + g.setServiceTitle(parseString(rowId, GranuleEnum.SERVICE_TITLE)); + //@format + + if (!g.isValid()) { + throw new IllegalArgumentException("One or more EPN parameter is null."); + } + return g; + } + public static boolean isV2(VOTableData data) { return !data.isContainingColumnName("index"); } public List getGranulesFromVOTable() throws ParseException { - Debug.writeObject("data", data); - if (!GranuleCtrl.isV2(data)) { throw new IllegalArgumentException( "The EPN-CORE is not v2, which is the only suported version"); } List granules = new ArrayList<>(); - if (data != null){ + if (data != null) { for (int rowId = 0; rowId < data.getNbRows(); rowId++) { granules.add(getGranuleFromVOTableRow(rowId)); } diff --git a/src/test/java/eu/omp/irap/vespa/epntapclient/EpnTapConnectionTest.java b/src/test/java/eu/omp/irap/vespa/epntapclient/EpnTapConnectionTest.java index c860b58..e01bf3d 100644 --- a/src/test/java/eu/omp/irap/vespa/epntapclient/EpnTapConnectionTest.java +++ b/src/test/java/eu/omp/irap/vespa/epntapclient/EpnTapConnectionTest.java @@ -335,13 +335,13 @@ public class EpnTapConnectionTest { assertEquals(8, granules.size()); Granule mars = null; for (Granule granule : granules) { - if ("Mars".equals(granule.granuleUid)) { + if ("Mars".equals(granule.getGranuleUid())) { mars = granule; } } assertNotNull("granule 'Mars' is not found.", mars); - assertEquals("4", mars.obsId); - assertEquals(new Integer(5), mars.processingLevel); + assertEquals("4", mars.getObsId()); + assertEquals(new Integer(5), mars.getProcessingLevel()); } /** @@ -360,12 +360,12 @@ public class EpnTapConnectionTest { assertEquals(8, granules.size()); Granule mars = null; for (Granule granule : granules) { - if ("Mars".equals(granule.granuleUid)) { + if ("Mars".equals(granule.getGranuleUid())) { mars = granule; } } assertNotNull("granule 'Mars' is not found.", mars); - assertEquals("4", mars.obsId); - assertEquals(new Integer(5), mars.processingLevel); + assertEquals("4", mars.getObsId()); + assertEquals(new Integer(5), mars.getProcessingLevel()); } } -- libgit2 0.21.2