From 6ca16f890770719499fb297ae87f355ff3e5c088 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 9 Nov 2022 15:06:26 +0100 Subject: [PATCH] Remoed old model "Concessioni" --- .../ConvertToDataValueObjectModel.java | 23 +- .../ConvertToDataViewModel.java | 544 +--------------- .../shared/products/BaseConcessioneDV.java | 84 --- .../shared/products/ConcessioneDV.java | 587 ------------------ .../products/content/AssociatedContentDV.java | 201 ------ .../products/content/OtherContentDV.java | 41 -- .../products/content/WorkspaceContentDV.java | 172 ----- .../model/AbstractRelazioneScavoDV.java | 121 ---- .../products/model/LayerConcessioneDV.java | 271 -------- .../shared/products/model/RecordDV.java | 297 --------- .../products/model/RelazioneScavoDV.java | 125 ---- .../products/model/SDILayerDescriptorDV.java | 141 ----- .../products/model/UploadedImageDV.java | 139 ----- .../products/model/ValidationReportDV.java | 186 ------ .../shared/products/paths/FileSetPathsDV.java | 66 -- 15 files changed, 24 insertions(+), 2974 deletions(-) delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/BaseConcessioneDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/ConcessioneDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/content/AssociatedContentDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/content/OtherContentDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/content/WorkspaceContentDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/model/AbstractRelazioneScavoDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/model/LayerConcessioneDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RecordDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RelazioneScavoDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/model/SDILayerDescriptorDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/model/UploadedImageDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/model/ValidationReportDV.java delete mode 100644 src/main/java/org/gcube/application/geoportalcommon/shared/products/paths/FileSetPathsDV.java diff --git a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java index fdfde50..265a5a5 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java +++ b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java @@ -83,10 +83,6 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer; */ public class ConvertToDataValueObjectModel { - private static final String CENTROID_LONG = "centroidLong"; - - private static final String CENTROID_LAT = "centroidLat"; - private static Logger LOG = LoggerFactory.getLogger(ConvertToDataValueObjectModel.class); private static final String NO_TIME = "T00:00"; @@ -606,7 +602,7 @@ public class ConvertToDataValueObjectModel { .read(jsonObject.getJSONObject("crs").toString(), Crs.class); geoJson.setCrs(crs); geoJson.setGeoJSON(jsonObject.toString()); - LOG.debug("toSpatialReference returning "+geoJson); + LOG.debug("toSpatialReference returning " + geoJson); } catch (JSONException | IOException e) { LOG.warn("Error on converting " + GeoJSON.class.getSimpleName() + " from : " + geoJSONObject, e); } @@ -639,7 +635,7 @@ public class ConvertToDataValueObjectModel { rd.setProfileID(project.getProfileID()); try { - + List ids = project .getIdentificationReferenceByType(IdentificationReferencesTYPE.SPATIAL_REFERENCE.getType()); if (ids != null && !ids.isEmpty()) { @@ -648,7 +644,7 @@ public class ConvertToDataValueObjectModel { } } catch (Exception e) { - LOG.warn("Error occurred on reading spatial reference for the project: "+project.getId()); + LOG.warn("Error occurred on reading spatial reference for the project: " + project.getId()); } rd.setPublicationInfo(toPublicationInfoDV(project.getInfo())); @@ -1183,19 +1179,6 @@ public class ConvertToDataValueObjectModel { return p; } - /** - * - * { "_type": "GIS-CENTROIDS", "layer": { "_type": "gcube-sdi-layer", - * "_platformInfo": [ { "_type": "Geoserver", "workspace": - * "profiledconcessioni_devvre", "storeName": - * "profiledconcessioni_devvre_centroids", "_host": - * "geoserver-218.dev.d4science.org" } ], "_bbox": { "_maxX": 180.0, "_minX": - * -180.0, "_maxY": 90.0, "_minY": -90.0 }, "_ogcLinks": { "wms": { "wms": - * "https://geoserver-218.dev.d4science.org/geoserver/profiledconcessioni_devvre/wms?service=WMS&version=1.1.0&request=GetMap&layers=profiledconcessioni_devvre:null&styles=&bbox=-180.000000,-90.000000,180.000000,90.000000&srs=EPSG:4326&format=application/openlayers&width=400&height=400" - * } } }, "indexName": "profiledconcessioni_devvre_centroids", "records": 4, - * "crossReferencedLayers": {}, "flag": "public" } - */ - public static IndexLayerDV convert(Index toConvert) throws InvalidObjectException { if (toConvert == null || toConvert.getType() == null) diff --git a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataViewModel.java b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataViewModel.java index 20b52a6..78f391f 100644 --- a/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataViewModel.java +++ b/src/main/java/org/gcube/application/geoportalcommon/ConvertToDataViewModel.java @@ -1,34 +1,10 @@ package org.gcube.application.geoportalcommon; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import org.gcube.application.geoportal.common.model.legacy.AbstractRelazione; import org.gcube.application.geoportal.common.model.legacy.AccessPolicy; import org.gcube.application.geoportal.common.model.legacy.BBOX; -import org.gcube.application.geoportal.common.model.legacy.Concessione; -import org.gcube.application.geoportal.common.model.legacy.LayerConcessione; -import org.gcube.application.geoportal.common.model.legacy.OtherContent; -import org.gcube.application.geoportal.common.model.legacy.PersistedContent; -import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo; -import org.gcube.application.geoportal.common.model.legacy.UploadedImage; -import org.gcube.application.geoportal.common.model.legacy.WorkspaceContent; -import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport; import org.gcube.application.geoportalcommon.shared.gis.BoundsMap; -import org.gcube.application.geoportalcommon.shared.products.BaseConcessioneDV; -import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; -import org.gcube.application.geoportalcommon.shared.products.content.OtherContentDV; -import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV; -import org.gcube.application.geoportalcommon.shared.products.model.AbstractRelazioneScavoDV; -import org.gcube.application.geoportalcommon.shared.products.model.LayerConcessioneDV; -import org.gcube.application.geoportalcommon.shared.products.model.RelazioneScavoDV; -import org.gcube.application.geoportalcommon.shared.products.model.UploadedImageDV; -import org.gcube.application.geoportalcommon.shared.products.model.ValidationReportDV; -import org.gcube.application.geoportalcommon.shared.products.model.ValidationReportDV.ValidationStatus; -import org.gcube.application.geoportalcommon.shared.products.paths.FileSetPathsDV; -import org.gcube.application.geoportalcommon.util.DateUtils; -import org.gcube.application.geoportalcommon.util.URLParserUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,252 +28,6 @@ public class ConvertToDataViewModel { public static final String TIME_FORMAT = "HH" + HOURS_MINUTES_SEPARATOR + "mm"; - - /** - * To concessione. - * - * @param concessione the concessione - * @return the concessione - * @throws Exception the exception - */ - public static ConcessioneDV toConcessione(Concessione concessione) throws Exception { - LOG.debug("toConcessione called"); - - if (concessione == null) - return null; - - LOG.debug("toConcessione called for concessione with mongoId: " + concessione.getMongo_id()); - if (LOG.isTraceEnabled()) - LOG.trace("Source concessione is: " + concessione); - - try { - - ConcessioneDV theConcessione = new ConcessioneDV(); - theConcessione.setPolicy(toPolicy(concessione.getPolicy())); - theConcessione.setAuthors(concessione.getAuthors()); - theConcessione.setCentroidLat(concessione.getCentroidLat()); - theConcessione.setCentroidLong(concessione.getCentroidLong()); - theConcessione.setContributore(concessione.getContributore()); - theConcessione.setCreationTime(DateUtils.asDate(concessione.getCreationTime())); - theConcessione.setCreationUser(toUser(concessione.getCreationUser())); - theConcessione.setDataInizioProgetto(DateUtils.asDate(concessione.getDataInizioProgetto())); - theConcessione.setDataFineProgetto(DateUtils.asDate(concessione.getDataFineProgetto())); - theConcessione.setDescrizioneContenuto(concessione.getDescrizioneContenuto()); - theConcessione.setEditore(concessione.getEditore()); - theConcessione.setFontiFinanziamento(concessione.getFontiFinanziamento()); - theConcessione.setItemId(concessione.getMongo_id()); - theConcessione.setNome(concessione.getNome()); - - theConcessione.setIntroduzione(concessione.getIntroduzione()); - theConcessione.setLastUpdateTime(DateUtils.asDate(concessione.getLastUpdateTime())); - theConcessione.setLastUpdateUser(toUser(concessione.getLastUpdateUser())); - theConcessione.setLicenzaID(concessione.getLicenzaID()); - theConcessione.setParoleChiaveICCD(concessione.getParoleChiaveICCD()); - theConcessione.setParoleChiaveLibere(concessione.getParoleChiaveLibere()); - - theConcessione.setResponsabile(concessione.getResponsabile()); - theConcessione.setRisorseCorrelate(concessione.getRisorseCorrelate()); - theConcessione.setSoggetto(concessione.getSoggetto()); - theConcessione.setTitolariCopyright(concessione.getTitolareCopyright()); - theConcessione.setTitolariLicenza(concessione.getTitolareLicenza()); - theConcessione.setTitolari(concessione.getTitolari()); - theConcessione.setVersion(concessione.getVersion()); - - theConcessione.setRecordType(concessione.getRecordType().name()); - - theConcessione.setAbstractRelazioneScavo(toAbstractRelazioneScavo(concessione.getAbstractRelazione())); - theConcessione.setRelazioneScavo(toRelazioneScavo(concessione.getRelazioneScavo())); - - if (concessione.getImmaginiRappresentative() != null) { - List uploadedImagesDV = new ArrayList( - concessione.getImmaginiRappresentative().size()); - for (UploadedImage ui : concessione.getImmaginiRappresentative()) { - uploadedImagesDV.add(toUploadedImage(ui)); - } - theConcessione.setImmaginiRappresentative(uploadedImagesDV); - } - - if (concessione.getGenericContent() != null) { - List otherContentsDV = new ArrayList( - concessione.getGenericContent().size()); - for (OtherContent gc : concessione.getGenericContent()) { - otherContentsDV.add(toOtherContentDV(gc)); - } - theConcessione.setGenericContent(otherContentsDV); - } - - if (concessione.getPianteFineScavo() != null) { - List piantaScavoDV = new ArrayList( - concessione.getPianteFineScavo().size()); - for (LayerConcessione lc : concessione.getPianteFineScavo()) { - // TODO CHECK WHY I HAVE TO PASS theConcessione = null IN ORDER TO AVOID GWT - // serialization error - piantaScavoDV.add(toLayerConcessione(lc, null)); - } - theConcessione.setPianteFineScavo(piantaScavoDV); - } - - if (concessione.getPosizionamentoScavo() != null) { - // TODO CHECK WHY I HAVE TO PASS theConcessione = null IN ORDER TO AVOID GWT - // serialization error - LayerConcessioneDV thePosizScavo = toLayerConcessione(concessione.getPosizionamentoScavo(), null); - theConcessione.setPosizionamentoScavo(thePosizScavo); - } - - LOG.debug("Returning concessioneDV with id: " + theConcessione.getItemId()); - - if (LOG.isTraceEnabled()) - LOG.trace("Returning: " + theConcessione); - - return theConcessione; - } catch (Exception e) { - LOG.error("Error on converting concessione: " + concessione, e); - return null; - } - - } - - /** - * To metadata concessione. - * - * @param concessione the concessione - * @param includeValidationReport the include validation report - * @return the concessione DV - * @throws Exception the exception - */ - public static ConcessioneDV toMetadataConcessione(Concessione concessione, boolean includeValidationReport) - throws Exception { - LOG.debug("toMetadataConcessione called"); - - if (concessione == null) - return null; - - LOG.debug("toMetadataConcessione called for concessione with [mongoId: " + concessione.getMongo_id() - + ", includeValidationReport: " + includeValidationReport + "]"); - if (LOG.isTraceEnabled()) - LOG.trace("Source concessione is: " + concessione); - - try { - - ConcessioneDV theConcessione = new ConcessioneDV(); - theConcessione.setPolicy(toPolicy(concessione.getPolicy())); - theConcessione.setCentroidLat(concessione.getCentroidLat()); - theConcessione.setCentroidLong(concessione.getCentroidLong()); - theConcessione.setContributore(concessione.getContributore()); - theConcessione.setCreationTime(DateUtils.asDate(concessione.getCreationTime())); - theConcessione.setCreationUser(toUser(concessione.getCreationUser())); - theConcessione.setDataInizioProgetto(DateUtils.asDate(concessione.getDataInizioProgetto())); - theConcessione.setDataFineProgetto(DateUtils.asDate(concessione.getDataFineProgetto())); - theConcessione.setDescrizioneContenuto(concessione.getDescrizioneContenuto()); - theConcessione.setEditore(concessione.getEditore()); - theConcessione.setFontiFinanziamento(concessione.getFontiFinanziamento()); - theConcessione.setItemId(concessione.getMongo_id()); - theConcessione.setNome(concessione.getNome()); - theConcessione.setAuthors(concessione.getAuthors()); - theConcessione.setCreationTime(DateUtils.asDate(concessione.getCreationTime())); - - theConcessione.setIntroduzione(concessione.getIntroduzione()); - theConcessione.setLastUpdateTime(DateUtils.asDate(concessione.getLastUpdateTime())); - theConcessione.setLastUpdateUser(toUser(concessione.getLastUpdateUser())); - theConcessione.setLicenzaID(concessione.getLicenzaID()); - theConcessione.setParoleChiaveICCD(concessione.getParoleChiaveICCD()); - theConcessione.setParoleChiaveLibere(concessione.getParoleChiaveLibere()); - - theConcessione.setResponsabile(concessione.getResponsabile()); - theConcessione.setTitolariCopyright(concessione.getTitolareCopyright()); - theConcessione.setTitolariLicenza(concessione.getTitolareLicenza()); - theConcessione.setTitolari(concessione.getTitolari()); - - if (includeValidationReport) { - theConcessione.setValidationReport(toValidationReport(concessione.getReport())); - if (theConcessione.getValidationReport() != null) - theConcessione.setValidationStatus(theConcessione.getValidationReport().getStatus()); - } - - LOG.info("Returning concessioneDV with id: " + theConcessione.getItemId()); - - if (LOG.isTraceEnabled()) - LOG.trace("Returning: " + theConcessione); - - return theConcessione; - } catch (Exception e) { - LOG.error("Error on converting concessione: " + concessione, e); - return null; - } - - } - - /** - * To validation report. - * - * @param validationReport the validation report - * @return the validation report DV - * @throws Exception the exception - */ - public static ValidationReportDV toValidationReport(ValidationReport validationReport) throws Exception { - LOG.debug("toValidationReport called"); - - if (validationReport == null) - return null; - - LOG.debug("toValidationReport called for: "+validationReport); - - ValidationReportDV theVR = new ValidationReportDV(); - theVR.setErrorMessages(validationReport.getErrorMessages()); - theVR.setObjectName(validationReport.getObjectName()); - theVR.setStatus(ValidationStatus.valueOf(validationReport.getStatus().name())); - theVR.setWarningMessages(validationReport.getWarningMessages()); - theVR.setAsJSONString(toJSON(validationReport)); - LOG.debug("Returning: "+theVR); - return theVR; - } - - /** - * To base concessione. - * - * @param concessione the concessione - * @return the concessione DV - * @throws Exception the exception - */ - public static BaseConcessioneDV toBaseConcessione(Concessione concessione) throws Exception { - LOG.debug("toBaseConcessione called"); - - if (concessione == null) - return null; - - LOG.debug("toBaseConcessione called for concessione with mongoId: " + concessione.getMongo_id()); - if (LOG.isTraceEnabled()) - LOG.trace("Source concessione is: " + concessione); - - try { - - BaseConcessioneDV theConcessione = new BaseConcessioneDV(); - theConcessione.setPolicy(toPolicy(concessione.getPolicy())); - theConcessione.setCreationTime(DateUtils.asDate(concessione.getCreationTime())); - theConcessione.setCreationUser(toUser(concessione.getCreationUser())); - theConcessione.setItemId(concessione.getMongo_id()); - theConcessione.setNome(concessione.getNome()); - theConcessione.setAuthors(concessione.getAuthors()); - theConcessione.setCreationTime(DateUtils.asDate(concessione.getCreationTime())); - - theConcessione.setIntroduzione(concessione.getIntroduzione()); - theConcessione.setLastUpdateTime(DateUtils.asDate(concessione.getLastUpdateTime())); - theConcessione.setLastUpdateUser(toUser(concessione.getLastUpdateUser())); - theConcessione.setLicenzaID(concessione.getLicenzaID()); - - LOG.debug("Returning BaseConcessioneDV with id: " + theConcessione.getItemId()); - - if (LOG.isTraceEnabled()) - LOG.trace("Returning: " + theConcessione); - - return theConcessione; - } catch (Exception e) { - LOG.error("Error on converting concessione: " + concessione, e); - return null; - } - - } - /** * To user. * @@ -328,259 +58,27 @@ public class ConvertToDataViewModel { } - - - /** - * To abstract relazione scavo. - * - * @param abstractRelazione the abstract relazione - * @return the abstract relazione scavo DV - */ - public static AbstractRelazioneScavoDV toAbstractRelazioneScavo(AbstractRelazione abstractRelazione) { - LOG.debug("toAbstractRelazioneScavo called"); - - if (abstractRelazione == null) - return null; - - AbstractRelazioneScavoDV theARelDiScavo = new AbstractRelazioneScavoDV(); - theARelDiScavo.setAbstractSectionIta(abstractRelazione.getAbstractIta()); - theARelDiScavo.setAbstractSectionEng(abstractRelazione.getAbstractEng()); - - theARelDiScavo.setCreationTime(DateUtils.asDate(abstractRelazione.getCreationTime())); - theARelDiScavo.setId(abstractRelazione.getId()); - theARelDiScavo.setLicenseID(abstractRelazione.getLicenseID()); - theARelDiScavo.setPolicy(toPolicy(abstractRelazione.getPolicy())); - theARelDiScavo.setTitolo(abstractRelazione.getTitolo()); - - List actContent = abstractRelazione.getActualContent(); - if (actContent != null && actContent.size() > 0) { - List listWsContent = new ArrayList(); - - for (PersistedContent content : actContent) { - if (content != null && content instanceof WorkspaceContent) { - listWsContent.add(toWorkspaceContent((WorkspaceContent) content)); - } - } - theARelDiScavo.setListWsContent(listWsContent); - } - - LOG.debug("Returning: " + theARelDiScavo); - return theARelDiScavo; - } - - /** - * To relazione scavo. - * - * @param relazioneScavo the relazione scavo - * @return the relazione scavo data view - */ - public static RelazioneScavoDV toRelazioneScavo(RelazioneScavo relazioneScavo) { - LOG.debug("toRelazioneScavo called"); - - if (relazioneScavo == null) - return null; - - RelazioneScavoDV theRelDiScavo = new RelazioneScavoDV(); - theRelDiScavo.setCreationTime(DateUtils.asDate(relazioneScavo.getCreationTime())); - theRelDiScavo.setId(relazioneScavo.getId()); - theRelDiScavo.setLicenseID(relazioneScavo.getLicenseID()); - theRelDiScavo.setPolicy(toPolicy(relazioneScavo.getPolicy())); - // theRelazioneDiScavo.setRecord(recordDV); - theRelDiScavo.setResponsabili(relazioneScavo.getResponsabili()); - theRelDiScavo.setSoggetto(relazioneScavo.getSoggetto()); - theRelDiScavo.setTitolo(relazioneScavo.getTitolo()); - - List actContent = relazioneScavo.getActualContent(); - if (actContent != null && actContent.size() > 0) { - List listWsContent = new ArrayList(); - - for (PersistedContent content : actContent) { - if (content != null && content instanceof WorkspaceContent) { - listWsContent.add(toWorkspaceContent((WorkspaceContent) content)); - } - } - theRelDiScavo.setListWsContent(listWsContent); - } - - LOG.debug("Returning: " + theRelDiScavo); - return theRelDiScavo; - } - - /** - * To uploaded image. - * - * @param uploadedImage the uploaded image - * @return the uploaded image data-view - */ - public static UploadedImageDV toUploadedImage(UploadedImage uploadedImage) { - LOG.debug("toUploadedImage called"); - - if (uploadedImage == null) - return null; - - UploadedImageDV theUploadedImageDV = new UploadedImageDV(); - theUploadedImageDV.setCreationTime(DateUtils.asDate(uploadedImage.getCreationTime())); - theUploadedImageDV.setDidascalia(uploadedImage.getDidascalia()); - theUploadedImageDV.setFormat(uploadedImage.getFormat()); - theUploadedImageDV.setId(uploadedImage.getId()); - theUploadedImageDV.setLicenseID(uploadedImage.getLicenseID()); - theUploadedImageDV.setPolicy(toPolicy(uploadedImage.getPolicy())); - // theUploadedImageDV.setRecord(recordDV); - theUploadedImageDV.setResponsabili(uploadedImage.getResponsabili()); - theUploadedImageDV.setSoggetto(uploadedImage.getSoggetto()); - theUploadedImageDV.setTitolo(uploadedImage.getTitolo()); - - List actContent = uploadedImage.getActualContent(); - if (actContent != null && actContent.size() > 0) { - List listWsContent = new ArrayList(); - - for (PersistedContent content : actContent) { - if (content != null && content instanceof WorkspaceContent) { - listWsContent.add(toWorkspaceContent((WorkspaceContent) content)); - } - } - theUploadedImageDV.setListWsContent(listWsContent); - } - - LOG.debug("Returning: " + theUploadedImageDV); - return theUploadedImageDV; - } - - /** - * To workspace content. - * - * @param wContent the w content - * @return the workspace content DV - */ - public static WorkspaceContentDV toWorkspaceContent(WorkspaceContent wContent) { - LOG.debug("toWorkspaceContent called"); - - if (wContent == null) - return null; - - WorkspaceContentDV theWSDV = new WorkspaceContentDV(); - theWSDV.setLink(wContent.getLink()); - theWSDV.setMimetype(wContent.getMimetype()); - theWSDV.setStorageID(wContent.getStorageID()); - theWSDV.setId(wContent.getId()); - theWSDV.setName(wContent.getName()); - - return theWSDV; - } - - /** - * To layer concessione. - * - * @param layerConcessione the layer concessione - * @param refersToBaseConcessione the refers to base concessione - * @return the layer concessione data view - */ - public static LayerConcessioneDV toLayerConcessione(LayerConcessione layerConcessione, - BaseConcessioneDV refersToBaseConcessione) { - - if (layerConcessione == null) - return null; - - LOG.debug("Converting: " + layerConcessione); - LayerConcessioneDV theLayerConessione = new LayerConcessioneDV(); - theLayerConessione.setAbstractSection(layerConcessione.getAbstractSection()); - - String wmsLink = layerConcessione.getWmsLink(); - String layerName = null; - BoundsMap bounds = null; - - // reading layer name from wmsLink - // string bbox - if (wmsLink != null) { - layerName = URLParserUtil.extractValueOfParameterFromURL("layers", wmsLink); - String bbox = URLParserUtil.extractValueOfParameterFromURL("bbox", wmsLink); - String wmsVersion = URLParserUtil.extractValueOfParameterFromURL("version", wmsLink); - bounds = toBoundMap(wmsVersion, bbox, ","); - LOG.debug("Built bounds from wmsLInk: " + bounds); - } - - if (layerName != null) - theLayerConessione.setLayerName(layerName); - else - theLayerConessione.setLayerName(layerConcessione.getLayerName()); - - theLayerConessione.setWmsLink(wmsLink); - theLayerConessione.setLayerID(layerConcessione.getLayerID()); - theLayerConessione.setLayerUUID(layerConcessione.getLayerUUID()); - theLayerConessione.setAuthors(layerConcessione.getAuthors()); - - if (bounds == null) - bounds = toBoundMap(layerConcessione.getBbox()); - - theLayerConessione.setBbox(bounds); - theLayerConessione.setCreationTime(DateUtils.asDate(layerConcessione.getCreationTime())); - theLayerConessione.setId(layerConcessione.getId()); - theLayerConessione.setLicenseID(layerConcessione.getLicenseID()); - theLayerConessione.setMetodoRaccoltaDati(layerConcessione.getMetodoRaccoltaDati()); - theLayerConessione.setPolicy(toPolicy(layerConcessione.getPolicy())); - // theLayerConessione.setRecord(recordDV); - theLayerConessione.setScalaAcquisizione(layerConcessione.getScalaAcquisizione()); - theLayerConessione.setSubTopic(layerConcessione.getSubTopic()); - theLayerConessione.setTitolo(layerConcessione.getTitolo()); - theLayerConessione.setTopicCategory(layerConcessione.getTopicCategory()); - theLayerConessione.setValutazioneQualita(layerConcessione.getValutazioneQualita()); - theLayerConessione.setRefersTo(refersToBaseConcessione); - - List actContent = layerConcessione.getActualContent(); - if (actContent != null && actContent.size() > 0) { - List listWsContent = new ArrayList(); - - for (PersistedContent content : actContent) { - if (content != null && content instanceof WorkspaceContent) { - listWsContent.add(toWorkspaceContent((WorkspaceContent) content)); - } - } - theLayerConessione.setListWsContent(listWsContent); - } - - LOG.debug("Returning: " + theLayerConessione); - return theLayerConessione; - - } - - /** - * To other content DV. - * - * @param otherContent the other content - * @return the other content DV - */ - public static OtherContentDV toOtherContentDV(OtherContent otherContent) { - - if (otherContent == null) - return null; - - OtherContentDV theOtherContent = new OtherContentDV(); - theOtherContent.setCreationTime(DateUtils.asDate(otherContent.getCreationTime())); - theOtherContent.setId(otherContent.getId()); - theOtherContent.setLicenseID(otherContent.getLicenseID()); - theOtherContent.setPolicy(toPolicy(otherContent.getPolicy())); - // theOtherContent.setRecord(recordDV); - theOtherContent.setTitolo(otherContent.getTitolo()); - - return theOtherContent; - } - - public static FileSetPathsDV getFileSetPaths() { - LOG.info("readFileSetPaths called"); - - FileSetPathsDV fsp = new FileSetPathsDV(); - List fileSetPaths = new ArrayList(); - fileSetPaths.add(Concessione.Paths.ABSTRACT_RELAZIONE); - fileSetPaths.add(Concessione.Paths.RELAZIONE); - fileSetPaths.add(Concessione.Paths.IMMAGINI); - fileSetPaths.add(Concessione.Paths.POSIZIONAMENTO); - fileSetPaths.add(Concessione.Paths.PIANTE); - - fsp.setFileSetPaths(fileSetPaths); - - return fsp; - - } +// /** +// * To workspace content. +// * +// * @param wContent the w content +// * @return the workspace content DV +// */ +// public static WorkspaceContentDV toWorkspaceContent(WorkspaceContent wContent) { +// LOG.debug("toWorkspaceContent called"); +// +// if (wContent == null) +// return null; +// +// WorkspaceContentDV theWSDV = new WorkspaceContentDV(); +// theWSDV.setLink(wContent.getLink()); +// theWSDV.setMimetype(wContent.getMimetype()); +// theWSDV.setStorageID(wContent.getStorageID()); +// theWSDV.setId(wContent.getId()); +// theWSDV.setName(wContent.getName()); +// +// return theWSDV; +// } /** * To bound map. diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/BaseConcessioneDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/BaseConcessioneDV.java deleted file mode 100644 index 0833080..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/BaseConcessioneDV.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products; - -import java.io.Serializable; -import java.util.List; - -import org.gcube.application.geoportalcommon.shared.products.model.RecordDV; - - -/** - * The Class BaseConcessioneDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it - * - * Sep 9, 2021 - */ -public class BaseConcessioneDV extends RecordDV implements Serializable { - - - /** - * - */ - private static final long serialVersionUID = -2291409985743665842L; - - /** The introduzione. */ - private String introduzione; - - /** The authors. */ - private List authors; - - /** - * Instantiates a new base concessione DV. - */ - public BaseConcessioneDV() { - - } - - /** - * Instantiates a new base concessione DV. - * - * @param introduzione the introduzione - * @param authors the authors - */ - public BaseConcessioneDV(String introduzione, List authors) { - this.introduzione = introduzione; - this.authors = authors; - } - - /** - * Gets the introduzione. - * - * @return the introduzione - */ - public String getIntroduzione() { - return introduzione; - } - - /** - * Gets the authors. - * - * @return the authors - */ - public List getAuthors() { - return authors; - } - - /** - * Sets the introduzione. - * - * @param introduzione the new introduzione - */ - public void setIntroduzione(String introduzione) { - this.introduzione = introduzione; - } - - /** - * Sets the authors. - * - * @param authors the new authors - */ - public void setAuthors(List authors) { - this.authors = authors; - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/ConcessioneDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/ConcessioneDV.java deleted file mode 100644 index 83278a2..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/ConcessioneDV.java +++ /dev/null @@ -1,587 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.gcube.application.geoportalcommon.shared.products.content.OtherContentDV; -import org.gcube.application.geoportalcommon.shared.products.model.AbstractRelazioneScavoDV; -import org.gcube.application.geoportalcommon.shared.products.model.LayerConcessioneDV; -import org.gcube.application.geoportalcommon.shared.products.model.RelazioneScavoDV; -import org.gcube.application.geoportalcommon.shared.products.model.UploadedImageDV; -import org.gcube.application.geoportalcommon.shared.products.model.ValidationReportDV; -import org.gcube.application.geoportalcommon.shared.products.model.ValidationReportDV.ValidationStatus; - -/** - * The Class ConcessioneDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Nov 4, 2020 - */ -public class ConcessioneDV extends BaseConcessioneDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1387327199157005059L; - - /** The descrizione contenuto. */ - private String descrizioneContenuto; - - /** The contributore. */ - private String contributore; - - /** The titolari. */ - private List titolari; - - /** The responsabile. */ - private String responsabile; - - /** The editore. */ - private String editore; - - /** The fonti finanziamento. */ - private List fontiFinanziamento; - - /** The soggetto. */ - private List soggetto; - - /** The risorse correlate. */ - private List risorseCorrelate; - - /** The data inizio progetto. */ - private Date dataInizioProgetto; - - /** The data fine progetto. */ - private Date dataFineProgetto; - - /** The titolare licenza. */ - private List titolariLicenza; - - /** The titolare copyright. */ - private List titolariCopyright; - - /** The parole chiave libere. */ - private List paroleChiaveLibere; - - /** The parole chiave ICCD. */ - private List paroleChiaveICCD; - - /** The centroid lat. */ - private Double centroidLat; - - /** The centroid long. */ - private Double centroidLong; - - /** The relazione scavo. */ - private AbstractRelazioneScavoDV abstractRelazioneScavo; - - /** The relazione scavo. */ - private RelazioneScavoDV relazioneScavo; - - /** The immagini rappresentative. */ - private List immaginiRappresentative = new ArrayList(); - - /** The posizionamento scavo. */ - private LayerConcessioneDV posizionamentoScavo; - - /** The piante fine scavo. */ - private List pianteFineScavo = new ArrayList(); - - /** The generic content. */ - private List genericContent = new ArrayList(); - - private ValidationReportDV validationReport = null; - - // Redundancy required by GUI. - //It is the value of ValidationReportDV::ValidationStatus. - private ValidationStatus validationStatus = null; - - /** - * Instantiates a new concessione. - */ - public ConcessioneDV() { - - } - - /** - * Gets the descrizione contenuto. - * - * @return the descrizione contenuto - */ - public String getDescrizioneContenuto() { - return descrizioneContenuto; - } - - /** - * Sets the descrizione contenuto. - * - * @param descrizioneContenuto the new descrizione contenuto - */ - public void setDescrizioneContenuto(String descrizioneContenuto) { - this.descrizioneContenuto = descrizioneContenuto; - } - - /** - * Gets the contributore. - * - * @return the contributore - */ - public String getContributore() { - return contributore; - } - - /** - * Sets the contributore. - * - * @param contributore the new contributore - */ - public void setContributore(String contributore) { - this.contributore = contributore; - } - - /** - * Gets the titolari. - * - * @return the titolari - */ - public List getTitolari() { - return titolari; - } - - /** - * Sets the titolari. - * - * @param titolari the new titolari - */ - public void setTitolari(List titolari) { - this.titolari = titolari; - } - - /** - * Gets the responsabile. - * - * @return the responsabile - */ - public String getResponsabile() { - return responsabile; - } - - /** - * Sets the responsabile. - * - * @param responsabile the new responsabile - */ - public void setResponsabile(String responsabile) { - this.responsabile = responsabile; - } - - /** - * Gets the editore. - * - * @return the editore - */ - public String getEditore() { - return editore; - } - - /** - * Sets the editore. - * - * @param editore the new editore - */ - public void setEditore(String editore) { - this.editore = editore; - } - - /** - * Gets the fonti finanziamento. - * - * @return the fonti finanziamento - */ - public List getFontiFinanziamento() { - return fontiFinanziamento; - } - - /** - * Sets the fonti finanziamento. - * - * @param fontiFinanziamento the new fonti finanziamento - */ - public void setFontiFinanziamento(List fontiFinanziamento) { - this.fontiFinanziamento = fontiFinanziamento; - } - - /** - * Gets the soggetto. - * - * @return the soggetto - */ - public List getSoggetto() { - return soggetto; - } - - /** - * Sets the soggetto. - * - * @param soggetto the new soggetto - */ - public void setSoggetto(List soggetto) { - this.soggetto = soggetto; - } - - /** - * Gets the risorse correlate. - * - * @return the risorse correlate - */ - public List getRisorseCorrelate() { - return risorseCorrelate; - } - - /** - * Sets the risorse correlate. - * - * @param risorseCorrelate the new risorse correlate - */ - public void setRisorseCorrelate(List risorseCorrelate) { - this.risorseCorrelate = risorseCorrelate; - } - - /** - * Gets the data inizio progetto. - * - * @return the data inizio progetto - */ - public Date getDataInizioProgetto() { - return dataInizioProgetto; - } - - /** - * Sets the data inizio progetto. - * - * @param dataInizioProgetto the new data inizio progetto - */ - public void setDataInizioProgetto(Date dataInizioProgetto) { - this.dataInizioProgetto = dataInizioProgetto; - } - - /** - * Gets the data fine progetto. - * - * @return the data fine progetto - */ - public Date getDataFineProgetto() { - return dataFineProgetto; - } - - /** - * Sets the data fine progetto. - * - * @param date the new data fine progetto - */ - public void setDataFineProgetto(Date date) { - this.dataFineProgetto = date; - } - - /** - * Gets the titolari licenza. - * - * @return the titolari licenza - */ - public List getTitolariLicenza() { - return titolariLicenza; - } - - /** - * Sets the titolari licenza. - * - * @param titolariLicenza the new titolari licenza - */ - public void setTitolariLicenza(List titolariLicenza) { - this.titolariLicenza = titolariLicenza; - } - - /** - * Gets the titolari copyright. - * - * @return the titolari copyright - */ - public List getTitolariCopyright() { - return titolariCopyright; - } - - /** - * Sets the titolari copyright. - * - * @param titolariCopyright the new titolari copyright - */ - public void setTitolariCopyright(List titolariCopyright) { - this.titolariCopyright = titolariCopyright; - } - - /** - * Gets the parole chiave libere. - * - * @return the parole chiave libere - */ - public List getParoleChiaveLibere() { - return paroleChiaveLibere; - } - - /** - * Sets the parole chiave libere. - * - * @param paroleChiaveLibere the new parole chiave libere - */ - public void setParoleChiaveLibere(List paroleChiaveLibere) { - this.paroleChiaveLibere = paroleChiaveLibere; - } - - /** - * Gets the parole chiave ICCD. - * - * @return the parole chiave ICCD - */ - public List getParoleChiaveICCD() { - return paroleChiaveICCD; - } - - /** - * Sets the parole chiave ICCD. - * - * @param paroleChiaveICCD the new parole chiave ICCD - */ - public void setParoleChiaveICCD(List paroleChiaveICCD) { - this.paroleChiaveICCD = paroleChiaveICCD; - } - - /** - * Gets the centroid lat. - * - * @return the centroid lat - */ - public Double getCentroidLat() { - return centroidLat; - } - - /** - * Sets the centroid lat. - * - * @param centroidLat the new centroid lat - */ - public void setCentroidLat(Double centroidLat) { - this.centroidLat = centroidLat; - } - - /** - * Gets the centroid long. - * - * @return the centroid long - */ - public Double getCentroidLong() { - return centroidLong; - } - - /** - * Sets the centroid long. - * - * @param centroidLong the new centroid long - */ - public void setCentroidLong(Double centroidLong) { - this.centroidLong = centroidLong; - } - - /** - * Gets the relazione scavo. - * - * @return the relazione scavo - */ - public RelazioneScavoDV getRelazioneScavo() { - return relazioneScavo; - } - - /** - * Sets the relazione scavo. - * - * @param relazioneScavo the new relazione scavo - */ - public void setRelazioneScavo(RelazioneScavoDV relazioneScavo) { - this.relazioneScavo = relazioneScavo; - } - - /** - * Gets the immagini rappresentative. - * - * @return the immagini rappresentative - */ - public List getImmaginiRappresentative() { - return immaginiRappresentative; - } - - /** - * Sets the immagini rappresentative. - * - * @param immaginiRappresentative the new immagini rappresentative - */ - public void setImmaginiRappresentative(List immaginiRappresentative) { - this.immaginiRappresentative = immaginiRappresentative; - } - - /** - * Gets the posizionamento scavo. - * - * @return the posizionamento scavo - */ - public LayerConcessioneDV getPosizionamentoScavo() { - return posizionamentoScavo; - } - - /** - * Sets the posizionamento scavo. - * - * @param posizionamentoScavo the new posizionamento scavo - */ - public void setPosizionamentoScavo(LayerConcessioneDV posizionamentoScavo) { - this.posizionamentoScavo = posizionamentoScavo; - } - - /** - * Gets the piante fine scavo. - * - * @return the piante fine scavo - */ - public List getPianteFineScavo() { - return pianteFineScavo; - } - - /** - * Sets the piante fine scavo. - * - * @param pianteFineScavo the new piante fine scavo - */ - public void setPianteFineScavo(List pianteFineScavo) { - this.pianteFineScavo = pianteFineScavo; - } - - /** - * Gets the generic content. - * - * @return the generic content - */ - public List getGenericContent() { - return genericContent; - } - - /** - * Sets the generic content. - * - * @param genericContent the new generic content - */ - public void setGenericContent(List genericContent) { - this.genericContent = genericContent; - } - - /** - * Gets the abstract relazione scavo. - * - * @return the abstract relazione scavo - */ - public AbstractRelazioneScavoDV getAbstractRelazioneScavo() { - return abstractRelazioneScavo; - } - - /** - * Sets the abstract relazione scavo. - * - * @param abstractRelazioneScavo the new abstract relazione scavo - */ - public void setAbstractRelazioneScavo(AbstractRelazioneScavoDV abstractRelazioneScavo) { - this.abstractRelazioneScavo = abstractRelazioneScavo; - } - - /** - * Gets the validation report. - * - * @return the validation report - */ - public ValidationReportDV getValidationReport() { - return validationReport; - } - - /** - * Sets the validation report. - * - * @param validationReport the new validation report - */ - public void setValidationReport(ValidationReportDV validationReport) { - this.validationReport = validationReport; - } - - public ValidationStatus getValidationStatus() { - return validationStatus; - } - - public void setValidationStatus(ValidationStatus validationStatus) { - this.validationStatus = validationStatus; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("ConcessioneDV [descrizioneContenuto="); - builder.append(descrizioneContenuto); - builder.append(", contributore="); - builder.append(contributore); - builder.append(", titolari="); - builder.append(titolari); - builder.append(", responsabile="); - builder.append(responsabile); - builder.append(", editore="); - builder.append(editore); - builder.append(", fontiFinanziamento="); - builder.append(fontiFinanziamento); - builder.append(", soggetto="); - builder.append(soggetto); - builder.append(", risorseCorrelate="); - builder.append(risorseCorrelate); - builder.append(", dataInizioProgetto="); - builder.append(dataInizioProgetto); - builder.append(", dataFineProgetto="); - builder.append(dataFineProgetto); - builder.append(", titolariLicenza="); - builder.append(titolariLicenza); - builder.append(", titolariCopyright="); - builder.append(titolariCopyright); - builder.append(", paroleChiaveLibere="); - builder.append(paroleChiaveLibere); - builder.append(", paroleChiaveICCD="); - builder.append(paroleChiaveICCD); - builder.append(", centroidLat="); - builder.append(centroidLat); - builder.append(", centroidLong="); - builder.append(centroidLong); - builder.append(", abstractRelazioneScavo="); - builder.append(abstractRelazioneScavo); - builder.append(", relazioneScavo="); - builder.append(relazioneScavo); - builder.append(", immaginiRappresentative="); - builder.append(immaginiRappresentative); - builder.append(", posizionamentoScavo="); - builder.append(posizionamentoScavo); - builder.append(", pianteFineScavo="); - builder.append(pianteFineScavo); - builder.append(", genericContent="); - builder.append(genericContent); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/AssociatedContentDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/AssociatedContentDV.java deleted file mode 100644 index 8721a25..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/AssociatedContentDV.java +++ /dev/null @@ -1,201 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.content; - -import java.io.Serializable; -import java.util.Date; - -import org.gcube.application.geoportalcommon.shared.products.model.RecordDV; - -/** - * The Class AssociatedContent. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Nov 2, 2020 - */ -public abstract class AssociatedContentDV implements Serializable{ - - - /** - * - */ - private static final long serialVersionUID = -3666420861504055117L; - - /** The id. */ - private long id; - - /** The policy. */ - private String policy; - - /** The license ID. */ - private String licenseID; - - /** The titolo. */ - private String titolo; - - /** The creation time. */ - private Date creationTime; - - /** The record. */ - private RecordDV record; - - - /** - * Instantiates a new associated content. - */ - public AssociatedContentDV() { - } - - /** - * Instantiates a new associated content. - * - * @param id the id - * @param policy the policy - * @param licenseID the license ID - * @param titolo the titolo - * @param creationTime the creation time - * @param record the record - */ - public AssociatedContentDV(long id, String policy, String licenseID, String titolo, Date creationTime, - RecordDV record) { - super(); - this.id = id; - this.policy = policy; - this.licenseID = licenseID; - this.titolo = titolo; - this.creationTime = creationTime; - this.record = record; - } - - /** - * Gets the id. - * - * @return the id - */ - public long getId() { - return id; - } - - /** - * Sets the id. - * - * @param id the new id - */ - public void setId(long id) { - this.id = id; - } - - /** - * Gets the policy. - * - * @return the policy - */ - public String getPolicy() { - return policy; - } - - /** - * Sets the policy. - * - * @param policy the new policy - */ - public void setPolicy(String policy) { - this.policy = policy; - } - - /** - * Gets the license ID. - * - * @return the license ID - */ - public String getLicenseID() { - return licenseID; - } - - /** - * Sets the license ID. - * - * @param licenseID the new license ID - */ - public void setLicenseID(String licenseID) { - this.licenseID = licenseID; - } - - /** - * Gets the titolo. - * - * @return the titolo - */ - public String getTitolo() { - return titolo; - } - - /** - * Sets the titolo. - * - * @param titolo the new titolo - */ - public void setTitolo(String titolo) { - this.titolo = titolo; - } - - /** - * Gets the creation time. - * - * @return the creation time - */ - public Date getCreationTime() { - return creationTime; - } - - /** - * Sets the creation time. - * - * @param creationTime the new creation time - */ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** - * Gets the record. - * - * @return the record - */ - public RecordDV getRecord() { - return record; - } - - /** - * Sets the record. - * - * @param record the new record - */ - public void setRecord(RecordDV record) { - this.record = record; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("AssociatedContent [id="); - builder.append(id); - builder.append(", policy="); - builder.append(policy); - builder.append(", licenseID="); - builder.append(licenseID); - builder.append(", titolo="); - builder.append(titolo); - builder.append(", creationTime="); - builder.append(creationTime); - builder.append(", record="); - builder.append(record); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/OtherContentDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/OtherContentDV.java deleted file mode 100644 index 7d51744..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/OtherContentDV.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.content; - -import java.io.Serializable; - -/** - * The Class OtherContent. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Nov 2, 2020 - */ -public class OtherContentDV extends AssociatedContentDV implements Serializable{ - - - /** - * - */ - private static final long serialVersionUID = -2550361768550673836L; - - /** - * Instantiates a new other content. - */ - public OtherContentDV() { - - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("OtherContent [toString()="); - builder.append(super.toString()); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/WorkspaceContentDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/WorkspaceContentDV.java deleted file mode 100644 index 5aad250..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/content/WorkspaceContentDV.java +++ /dev/null @@ -1,172 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.content; - -import java.io.Serializable; - -/** - * The Class WorkspaceContentDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Nov 5, 2020 - */ -public class WorkspaceContentDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -3919923007831416696L; - - /** The mimetype. */ - private String mimetype; - - /** The storage ID. */ - private String storageID; - - /** The link. */ - private String link; - - private Long id; - - private String name; - - // this field is used by GUI - private Integer cliendId; - - /** - * Instantiates a new workspace content DV. - */ - public WorkspaceContentDV() { - - } - - /** - * Gets the id. - * - * @return the id - */ - public Long getId() { - return id; - } - - /** - * Sets the id. - * - * @param id the new id - */ - public void setId(Long id) { - this.id = id; - } - - /** - * Gets the mimetype. - * - * @return the mimetype - */ - public String getMimetype() { - return mimetype; - } - - /** - * Sets the mimetype. - * - * @param mimetype the new mimetype - */ - public void setMimetype(String mimetype) { - this.mimetype = mimetype; - } - - /** - * Gets the storage ID. - * - * @return the storage ID - */ - public String getStorageID() { - return storageID; - } - - /** - * Sets the storage ID. - * - * @param storageID the new storage ID - */ - public void setStorageID(String storageID) { - this.storageID = storageID; - } - - /** - * Gets the link. - * - * @return the link - */ - public String getLink() { - return link; - } - - /** - * Sets the link. - * - * @param link the new link - */ - public void setLink(String link) { - this.link = link; - } - - /** - * Gets the name. - * - * @return the name - */ - public String getName() { - return name; - } - - /** - * Sets the name. - * - * @param name the new name - */ - public void setName(String name) { - this.name = name; - } - - /** - * Gets the cliend id. - * - * @return the cliend id - */ - public Integer getCliendId() { - return cliendId; - } - - /** - * Sets the cliend id. - * - * @param cliendId the new cliend id - */ - public void setCliendId(Integer cliendId) { - this.cliendId = cliendId; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("WorkspaceContentDV [mimetype="); - builder.append(mimetype); - builder.append(", storageID="); - builder.append(storageID); - builder.append(", link="); - builder.append(link); - builder.append(", id="); - builder.append(id); - builder.append(", name="); - builder.append(name); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/AbstractRelazioneScavoDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/AbstractRelazioneScavoDV.java deleted file mode 100644 index a1b7695..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/AbstractRelazioneScavoDV.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.model; - -import java.io.Serializable; -import java.util.List; - -import org.gcube.application.geoportalcommon.shared.products.content.AssociatedContentDV; -import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV; - -/** - * The Class AbstractRelazioneScavoDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it - * - * Sep 24, 2021 - */ -public class AbstractRelazioneScavoDV extends AssociatedContentDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 8768745863185590509L; - - /** The abstract section. */ - private String abstractSectionIta; - - private String abstractSectionEng; - - private List listWsContent; - - /** - * Instantiates a new abstract relazione scavo. - */ - public AbstractRelazioneScavoDV() { - - } - - /** - * Instantiates a new abstract relazione scavo DV. - * - * @param abstractSectionIta the abstract section ita - * @param abstractSectionEng the abstract section eng - */ - public AbstractRelazioneScavoDV(String abstractSectionIta, String abstractSectionEng) { - super(); - this.abstractSectionIta = abstractSectionIta; - this.abstractSectionEng = abstractSectionEng; - } - - /** - * Gets the abstract section ita. - * - * @return the abstract section ita - */ - public String getAbstractSectionIta() { - return abstractSectionIta; - } - - /** - * Sets the abstract section ita. - * - * @param abstractSectionIta the new abstract section ita - */ - public void setAbstractSectionIta(String abstractSectionIta) { - this.abstractSectionIta = abstractSectionIta; - } - - /** - * Gets the abstract section eng. - * - * @return the abstract section eng - */ - public String getAbstractSectionEng() { - return abstractSectionEng; - } - - /** - * Sets the abstract section eng. - * - * @param abstractSectionEng the new abstract section eng - */ - public void setAbstractSectionEng(String abstractSectionEng) { - this.abstractSectionEng = abstractSectionEng; - } - - /** - * Gets the list ws content. - * - * @return the list ws content - */ - public List getListWsContent() { - return listWsContent; - } - - /** - * Sets the list ws content. - * - * @param listWsContent the new list ws content - */ - public void setListWsContent(List listWsContent) { - this.listWsContent = listWsContent; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("AbstractRelazioneScavoDV [abstractSectionIta="); - builder.append(abstractSectionIta); - builder.append(", abstractSectionEng="); - builder.append(abstractSectionEng); - builder.append(", listWsContent="); - builder.append(listWsContent); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/LayerConcessioneDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/LayerConcessioneDV.java deleted file mode 100644 index 7dcef24..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/LayerConcessioneDV.java +++ /dev/null @@ -1,271 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.model; - -import java.io.Serializable; -import java.util.List; - -import org.gcube.application.geoportalcommon.shared.gis.BoundsMap; -import org.gcube.application.geoportalcommon.shared.products.BaseConcessioneDV; -import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV; - -/** - * The Class LayerConcessioneDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it - * - * Sep 9, 2021 - */ -public class LayerConcessioneDV extends SDILayerDescriptorDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 2633250621043744245L; - - // 1.Identificazione - private String abstractSection; - - // 2.Classificazione - private String topicCategory; - - // 3.Keyword - private String subTopic; - - // 4. Delimitazione geographica - private BoundsMap bbox; - - // 5. Temporal - - // 6. Quality - private String valutazioneQualita; - - private String metodoRaccoltaDati; - - private String scalaAcquisizione; - - private List authors; - - private BaseConcessioneDV refersTo; - - private List listWsContent; - - /** - * Instantiates a new layer concessione DV. - */ - public LayerConcessioneDV() { - - } - - /** - * Gets the abstract section. - * - * @return the abstract section - */ - public String getAbstractSection() { - return abstractSection; - } - - /** - * Sets the abstract section. - * - * @param abstractSection the new abstract section - */ - public void setAbstractSection(String abstractSection) { - this.abstractSection = abstractSection; - } - - /** - * Gets the topic category. - * - * @return the topic category - */ - public String getTopicCategory() { - return topicCategory; - } - - /** - * Sets the topic category. - * - * @param topicCategory the new topic category - */ - public void setTopicCategory(String topicCategory) { - this.topicCategory = topicCategory; - } - - /** - * Gets the sub topic. - * - * @return the sub topic - */ - public String getSubTopic() { - return subTopic; - } - - /** - * Sets the sub topic. - * - * @param subTopic the new sub topic - */ - public void setSubTopic(String subTopic) { - this.subTopic = subTopic; - } - - /** - * Gets the bbox. - * - * @return the bbox - */ - public BoundsMap getBbox() { - return bbox; - } - - /** - * Sets the bbox. - * - * @param bbox the new bbox - */ - public void setBbox(BoundsMap bbox) { - this.bbox = bbox; - } - - /** - * Gets the valutazione qualita. - * - * @return the valutazione qualita - */ - public String getValutazioneQualita() { - return valutazioneQualita; - } - - /** - * Sets the valutazione qualita. - * - * @param valutazioneQualita the new valutazione qualita - */ - public void setValutazioneQualita(String valutazioneQualita) { - this.valutazioneQualita = valutazioneQualita; - } - - /** - * Gets the metodo raccolta dati. - * - * @return the metodo raccolta dati - */ - public String getMetodoRaccoltaDati() { - return metodoRaccoltaDati; - } - - /** - * Sets the metodo raccolta dati. - * - * @param metodoRaccoltaDati the new metodo raccolta dati - */ - public void setMetodoRaccoltaDati(String metodoRaccoltaDati) { - this.metodoRaccoltaDati = metodoRaccoltaDati; - } - - /** - * Gets the scala acquisizione. - * - * @return the scala acquisizione - */ - public String getScalaAcquisizione() { - return scalaAcquisizione; - } - - /** - * Sets the scala acquisizione. - * - * @param scalaAcquisizione the new scala acquisizione - */ - public void setScalaAcquisizione(String scalaAcquisizione) { - this.scalaAcquisizione = scalaAcquisizione; - } - - /** - * Gets the authors. - * - * @return the authors - */ - public List getAuthors() { - return authors; - } - - /** - * Sets the authors. - * - * @param authors the new authors - */ - public void setAuthors(List authors) { - this.authors = authors; - } - - /** - * Gets the refers to. - * - * @return the refers to - */ - public BaseConcessioneDV getRefersTo() { - return refersTo; - } - - /** - * Sets the refers to. - * - * @param refersTo the new refers to - */ - public void setRefersTo(BaseConcessioneDV refersTo) { - this.refersTo = refersTo; - } - - /** - * Sets the list ws content. - * - * @param listWsContent the new list ws content - */ - public void setListWsContent(List listWsContent) { - this.listWsContent = listWsContent; - - } - - /** - * Gets the list ws content. - * - * @return the list ws content - */ - public List getListWsContent() { - return listWsContent; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("LayerConcessioneDV [abstractSection="); - builder.append(abstractSection); - builder.append(", topicCategory="); - builder.append(topicCategory); - builder.append(", subTopic="); - builder.append(subTopic); - builder.append(", bbox="); - builder.append(bbox); - builder.append(", valutazioneQualita="); - builder.append(valutazioneQualita); - builder.append(", metodoRaccoltaDati="); - builder.append(metodoRaccoltaDati); - builder.append(", scalaAcquisizione="); - builder.append(scalaAcquisizione); - builder.append(", authors="); - builder.append(authors); - builder.append(", refersTo="); - builder.append(refersTo); - builder.append(", listWsContent="); - builder.append(listWsContent); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RecordDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RecordDV.java deleted file mode 100644 index 46d0d5c..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RecordDV.java +++ /dev/null @@ -1,297 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.model; - -import java.io.Serializable; -import java.util.Date; - - -/** - * The Class RecordDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it - * - * Aug 2, 2021 - */ -public abstract class RecordDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 2913726613820175679L; - - /** The id. */ - // this is the mongoID - private String itemId; - - /** The record type. */ - private String recordType; - - /** The version. */ - private String version = "1.0.0"; - - /** The licenza ID. */ - private String licenzaID; - - private String policy; - - /** The nome. */ - // Nome del progetto - private String nome; - - /** The folder id. */ - // Storage Info - private String folderId; - - /** The last update time. */ - // Accounting - private Date lastUpdateTime; - - /** The last update user. */ - private String lastUpdateUser; - - /** The creation time. */ - private Date creationTime; - - /** The creation user. */ - private String creationUser; - - /** - * Instantiates a new record. - */ - public RecordDV() { - - } - - /** - * Gets the item id. - * - * @return the item id - */ - public String getItemId() { - return itemId; - } - - /** - * Sets the item id. - * - * @param itemId the new item id - */ - public void setItemId(String itemId) { - this.itemId = itemId; - } - - /** - * Gets the record type. - * - * @return the record type - */ - public String getRecordType() { - return recordType; - } - - /** - * Sets the record type. - * - * @param recordType the new record type - */ - public void setRecordType(String recordType) { - this.recordType = recordType; - } - - /** - * Gets the version. - * - * @return the version - */ - public String getVersion() { - return version; - } - - /** - * Sets the version. - * - * @param version the new version - */ - public void setVersion(String version) { - this.version = version; - } - - /** - * Gets the licenza ID. - * - * @return the licenza ID - */ - public String getLicenzaID() { - return licenzaID; - } - - /** - * Sets the licenza ID. - * - * @param licenzaID the new licenza ID - */ - public void setLicenzaID(String licenzaID) { - this.licenzaID = licenzaID; - } - - /** - * Gets the accesso. - * - * @return the accesso - */ - public String getPolicy() { - return policy; - } - - /** - * Sets the accesso. - * - * @param policy the new policy - */ - public void setPolicy(String policy) { - this.policy = policy; - } - - /** - * Gets the nome. - * - * @return the nome - */ - public String getNome() { - return nome; - } - - /** - * Sets the nome. - * - * @param nome the new nome - */ - public void setNome(String nome) { - this.nome = nome; - } - - /** - * Gets the folder id. - * - * @return the folder id - */ - public String getFolderId() { - return folderId; - } - - /** - * Sets the folder id. - * - * @param folderId the new folder id - */ - public void setFolderId(String folderId) { - this.folderId = folderId; - } - - /** - * Gets the last update time. - * - * @return the last update time - */ - public Date getLastUpdateTime() { - return lastUpdateTime; - } - - /** - * Sets the last update time. - * - * @param date the new last update time - */ - public void setLastUpdateTime(Date date) { - this.lastUpdateTime = date; - } - - /** - * Gets the last update user. - * - * @return the last update user - */ - public String getLastUpdateUser() { - return lastUpdateUser; - } - - /** - * Sets the last update user. - * - * @param lastUpdateUser the new last update user - */ - public void setLastUpdateUser(String lastUpdateUser) { - this.lastUpdateUser = lastUpdateUser; - } - - /** - * Gets the creation time. - * - * @return the creation time - */ - public Date getCreationTime() { - return creationTime; - } - - /** - * Sets the creation time. - * - * @param creationTime the new creation time - */ - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - /** - * Gets the creation user. - * - * @return the creation user - */ - public String getCreationUser() { - return creationUser; - } - - /** - * Sets the creation user. - * - * @param creationUser the new creation user - */ - public void setCreationUser(String creationUser) { - this.creationUser = creationUser; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("RecordDV [itemId="); - builder.append(itemId); - builder.append(", recordType="); - builder.append(recordType); - builder.append(", version="); - builder.append(version); - builder.append(", licenzaID="); - builder.append(licenzaID); - builder.append(", policy="); - builder.append(policy); - builder.append(", nome="); - builder.append(nome); - builder.append(", folderId="); - builder.append(folderId); - builder.append(", lastUpdateTime="); - builder.append(lastUpdateTime); - builder.append(", lastUpdateUser="); - builder.append(lastUpdateUser); - builder.append(", creationTime="); - builder.append(creationTime); - builder.append(", creationUser="); - builder.append(creationUser); - builder.append("]"); - return builder.toString(); - } - - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RelazioneScavoDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RelazioneScavoDV.java deleted file mode 100644 index 252ed3b..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/RelazioneScavoDV.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.model; - -import java.io.Serializable; -import java.util.List; - -import org.gcube.application.geoportalcommon.shared.products.content.AssociatedContentDV; -import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV; - - -/** - * The Class RelazioneScavoDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Dec 21, 2020 - */ -public class RelazioneScavoDV extends AssociatedContentDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 2456950567302197554L; - - /** The responsabili. */ - private List responsabili; - - /** The soggetto. */ - private List soggetto; - - private List listWsContent; - - /** - * Instantiates a new relazione scavo DV. - */ - public RelazioneScavoDV() { - - } - - /** - * Instantiates a new relazione scavo DV. - * - * @param responsabili the responsabili - * @param soggetto the soggetto - */ - public RelazioneScavoDV(List responsabili, List soggetto) { - super(); - this.responsabili = responsabili; - this.soggetto = soggetto; - } - - /** - * Gets the responsabili. - * - * @return the responsabili - */ - public List getResponsabili() { - return responsabili; - } - - /** - * Sets the responsabili. - * - * @param responsabili the new responsabili - */ - public void setResponsabili(List responsabili) { - this.responsabili = responsabili; - } - - /** - * Gets the soggetto. - * - * @return the soggetto - */ - public List getSoggetto() { - return soggetto; - } - - /** - * Sets the soggetto. - * - * @param soggetto the new soggetto - */ - public void setSoggetto(List soggetto) { - this.soggetto = soggetto; - } - - /** - * Gets the list ws content. - * - * @return the list ws content - */ - public List getListWsContent() { - return listWsContent; - } - - /** - * Sets the list ws content. - * - * @param listWsContent the new list ws content - */ - public void setListWsContent(List listWsContent) { - this.listWsContent = listWsContent; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("RelazioneScavoDV [responsabili="); - builder.append(responsabili); - builder.append(", soggetto="); - builder.append(soggetto); - builder.append(", listWsContent="); - builder.append(listWsContent); - builder.append("]"); - return builder.toString(); - } - - - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/SDILayerDescriptorDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/SDILayerDescriptorDV.java deleted file mode 100644 index 768db20..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/SDILayerDescriptorDV.java +++ /dev/null @@ -1,141 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.model; - -import java.io.Serializable; - -import org.gcube.application.geoportalcommon.shared.products.content.AssociatedContentDV; - - -/** - * The Class SDILayerDescriptorDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Nov 4, 2020 - */ -public class SDILayerDescriptorDV extends AssociatedContentDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 6137246723753812015L; - // meta - private String layerUUID; - private Long layerID; - - // layer - private String layerName; - private String wmsLink; - - /** - * Instantiates a new SDI layer descriptor DV. - */ - public SDILayerDescriptorDV() { - } - - /** - * Instantiates a new SDI layer descriptor DV. - * - * @param layerUUID the layer UUID - * @param layerID the layer ID - * @param layerName the layer name - * @param wmsLink the wms link - */ - public SDILayerDescriptorDV(String layerUUID, Long layerID, String layerName, String wmsLink) { - super(); - this.layerUUID = layerUUID; - this.layerID = layerID; - this.layerName = layerName; - this.wmsLink = wmsLink; - } - - /** - * Gets the layer UUID. - * - * @return the layer UUID - */ - public String getLayerUUID() { - return layerUUID; - } - - /** - * Sets the layer UUID. - * - * @param layerUUID the new layer UUID - */ - public void setLayerUUID(String layerUUID) { - this.layerUUID = layerUUID; - } - - /** - * Gets the layer ID. - * - * @return the layer ID - */ - public Long getLayerID() { - return layerID; - } - - /** - * Sets the layer ID. - * - * @param layerID the new layer ID - */ - public void setLayerID(Long layerID) { - this.layerID = layerID; - } - - /** - * Gets the layer name. - * - * @return the layer name - */ - public String getLayerName() { - return layerName; - } - - /** - * Sets the layer name. - * - * @param layerName the new layer name - */ - public void setLayerName(String layerName) { - this.layerName = layerName; - } - - /** - * Gets the wms link. - * - * @return the wms link - */ - public String getWmsLink() { - return wmsLink; - } - - /** - * Sets the wms link. - * - * @param wmsLink the new wms link - */ - public void setWmsLink(String wmsLink) { - this.wmsLink = wmsLink; - } - - /* (non-Javadoc) - * @see org.gcube.portlets.user.geoportaldataviewer.shared.products.content.AssociatedContentDV#toString() - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("SDILayerDescriptor [layerUUID="); - builder.append(layerUUID); - builder.append(", layerID="); - builder.append(layerID); - builder.append(", layerName="); - builder.append(layerName); - builder.append(", wmsLink="); - builder.append(wmsLink); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/UploadedImageDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/UploadedImageDV.java deleted file mode 100644 index 972727c..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/UploadedImageDV.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.model; - -import java.io.Serializable; -import java.util.List; - -import org.gcube.application.geoportalcommon.shared.products.content.AssociatedContentDV; -import org.gcube.application.geoportalcommon.shared.products.content.WorkspaceContentDV; - -/** - * The Class UploadedImage. - * - * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) - * - * Nov 2, 2020 - */ -public class UploadedImageDV extends AssociatedContentDV implements Serializable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 809167060189883015L; - - /** The didascalia. */ - private String didascalia; - - /** The format. */ - private String format; - - /** The responsabili. */ - private List responsabili; - - /** The soggetto. */ - private List soggetto; - - private List listWsContent; - - /** - * Instantiates a new uploaded image. - */ - public UploadedImageDV() { - - } - - /** - * Gets the didascalia. - * - * @return the didascalia - */ - public String getDidascalia() { - return didascalia; - } - - /** - * Sets the didascalia. - * - * @param didascalia the new didascalia - */ - public void setDidascalia(String didascalia) { - this.didascalia = didascalia; - } - - /** - * Gets the format. - * - * @return the format - */ - public String getFormat() { - return format; - } - - /** - * Sets the format. - * - * @param format the new format - */ - public void setFormat(String format) { - this.format = format; - } - - /** - * Gets the responsabili. - * - * @return the responsabili - */ - public List getResponsabili() { - return responsabili; - } - - /** - * Sets the responsabili. - * - * @param responsabili the new responsabili - */ - public void setResponsabili(List responsabili) { - this.responsabili = responsabili; - } - - /** - * Gets the soggetto. - * - * @return the soggetto - */ - public List getSoggetto() { - return soggetto; - } - - /** - * Sets the soggetto. - * - * @param soggetto the new soggetto - */ - public void setSoggetto(List soggetto) { - this.soggetto = soggetto; - } - - public List getListWsContent() { - return listWsContent; - } - - public void setListWsContent(List listWsContent) { - this.listWsContent = listWsContent; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("UploadedImageDV [didascalia="); - builder.append(didascalia); - builder.append(", format="); - builder.append(format); - builder.append(", responsabili="); - builder.append(responsabili); - builder.append(", soggetto="); - builder.append(soggetto); - builder.append(", listWsContent="); - builder.append(listWsContent); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/ValidationReportDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/ValidationReportDV.java deleted file mode 100644 index dc486ca..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/model/ValidationReportDV.java +++ /dev/null @@ -1,186 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.model; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * The Class ValidationReportDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it - * - * Sep 13, 2021 - */ -public class ValidationReportDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -4579856308279187824L; - - /** - * The Enum ValidationStatus. - * - * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it - * - * Sep 13, 2021 - */ - public static enum ValidationStatus { - PASSED("Success"), ERROR("Error"), WARNING("Warning"); - - private String label; - - private ValidationStatus(String label) { - this.label = label; - } - - public String getLabel() { - return label; - } - } - - private String objectName; - private ValidationStatus status; - private List errorMessages = new ArrayList(); - private List warningMessages = new ArrayList(); - private String asJSONString; - - /** - * Instantiates a new validation report DV. - */ - public ValidationReportDV() { - - } - - /** - * Instantiates a new validation report DV. - * - * @param objectName the object name - * @param status the status - * @param errorMessages the error messages - * @param warningMessages the warning messages - * @param asJSONString the as JSON string - */ - public ValidationReportDV(String objectName, ValidationStatus status, List errorMessages, - List warningMessages, String asJSONString) { - super(); - this.objectName = objectName; - this.status = status; - this.errorMessages = errorMessages; - this.warningMessages = warningMessages; - this.asJSONString = asJSONString; - } - - /** - * Gets the object name. - * - * @return the object name - */ - public String getObjectName() { - return objectName; - } - - /** - * Gets the status. - * - * @return the status - */ - public ValidationStatus getStatus() { - return status; - } - - /** - * Gets the error messages. - * - * @return the error messages - */ - public List getErrorMessages() { - return errorMessages; - } - - /** - * Gets the warning messages. - * - * @return the warning messages - */ - public List getWarningMessages() { - return warningMessages; - } - - /** - * Gets the as JSON string. - * - * @return the as JSON string - */ - public String getAsJSONString() { - return asJSONString; - } - - /** - * Sets the object name. - * - * @param objectName the new object name - */ - public void setObjectName(String objectName) { - this.objectName = objectName; - } - - /** - * Sets the status. - * - * @param status the new status - */ - public void setStatus(ValidationStatus status) { - this.status = status; - } - - /** - * Sets the error messages. - * - * @param errorMessages the new error messages - */ - public void setErrorMessages(List errorMessages) { - this.errorMessages = errorMessages; - } - - /** - * Sets the warning messages. - * - * @param warningMessages the new warning messages - */ - public void setWarningMessages(List warningMessages) { - this.warningMessages = warningMessages; - } - - /** - * Sets the as JSON string. - * - * @param asJSONString the new as JSON string - */ - public void setAsJSONString(String asJSONString) { - this.asJSONString = asJSONString; - } - - /** - * To string. - * - * @return the string - */ - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("ValidationReportDV [objectName="); - builder.append(objectName); - builder.append(", status="); - builder.append(status); - builder.append(", errorMessages="); - builder.append(errorMessages); - builder.append(", warningMessages="); - builder.append(warningMessages); - builder.append(", asJSONString="); - builder.append(asJSONString); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/src/main/java/org/gcube/application/geoportalcommon/shared/products/paths/FileSetPathsDV.java b/src/main/java/org/gcube/application/geoportalcommon/shared/products/paths/FileSetPathsDV.java deleted file mode 100644 index 28c9f01..0000000 --- a/src/main/java/org/gcube/application/geoportalcommon/shared/products/paths/FileSetPathsDV.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.gcube.application.geoportalcommon.shared.products.paths; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * The Class FileSetPathsDV. - * - * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it - * - * Sep 29, 2021 - */ -public class FileSetPathsDV implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 7494678009053802818L; - List fileSetPaths = new ArrayList(); - - /** - * Instantiates a new file set paths DV. - */ - public FileSetPathsDV() { - - } - - /** - * Instantiates a new file set paths DV. - * - * @param fileSetPaths the file set paths - */ - public FileSetPathsDV(List fileSetPaths) { - super(); - this.fileSetPaths = fileSetPaths; - } - - /** - * Gets the file set paths. - * - * @return the file set paths - */ - public List getFileSetPaths() { - return fileSetPaths; - } - - /** - * Sets the file set paths. - * - * @param fileSetPaths the new file set paths - */ - public void setFileSetPaths(List fileSetPaths) { - this.fileSetPaths = fileSetPaths; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("FileSetPathsDV [fileSetPaths="); - builder.append(fileSetPaths); - builder.append("]"); - return builder.toString(); - } - -}