From 8b16d5f7b3f4b48bb3bb51b01c21f9d3b8fcaf74 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Mon, 19 Oct 2020 17:27:42 +0200 Subject: [PATCH] Model field names fixes --- pom.xml | 6 +++- .../managers/ConcessioneManager.java | 6 ++-- .../model/concessioni/Concessione.java | 26 ++++++++--------- .../geoportal/storage/ContentHandler.java | 28 +++++++++++++++---- .../application/geoportal/TestModel.java | 6 ++-- 5 files changed, 47 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index da06f05..1003051 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,11 @@ 2.5.0 - + + org.gcube.spatial.data + sdi-library + [1.0.0-SNAPSHOT,2.0.0) + org.gcube.spatial.data gis-interface diff --git a/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java b/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java index 5b30439..4a5c786 100644 --- a/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java +++ b/src/main/java/org/gcube/application/geoportal/managers/ConcessioneManager.java @@ -101,7 +101,7 @@ public class ConcessioneManager extends AbstractRecordManager { // CENTROID Map centroidsRow=new HashMap(); // centroidsRow.put(DBConstants.Concessioni.UUID, toRegister.getId()+""); - centroidsRow.put(DBConstants.Concessioni.ANNO, record.getDataInizioScavo().get(ChronoField.YEAR)+""); + centroidsRow.put(DBConstants.Concessioni.ANNO, record.getDataInizioProgetto().get(ChronoField.YEAR)+""); centroidsRow.put(DBConstants.Concessioni.NOME, record.getNome()); centroidsRow.put(DBConstants.Concessioni.REGIONE, ""); centroidsRow.put(DBConstants.Defaults.XCOORD_FIELD, record.getCentroidLong()+""); @@ -115,10 +115,10 @@ public class ConcessioneManager extends AbstractRecordManager { centroidsRow.put(DBConstants.Concessioni.TITOLARE,Serialization.asString(record.getTitolari())); centroidsRow.put(DBConstants.Concessioni.RESPONSABILE,record.getResponsabile()); centroidsRow.put(DBConstants.Concessioni.EDITORE,record.getEditore()); - centroidsRow.put(DBConstants.Concessioni.FINANZIAMENTO,Serialization.asString(record.getFontiFinanaziamento())); + centroidsRow.put(DBConstants.Concessioni.FINANZIAMENTO,Serialization.asString(record.getFontiFinanziamento())); centroidsRow.put(DBConstants.Concessioni.SOGGETTO,Serialization.asString(record.getSoggetto())); centroidsRow.put(DBConstants.Concessioni.RISORSE,Serialization.asString(record.getRisorseCorrelate())); - centroidsRow.put(DBConstants.Concessioni.DATE_SCAVO,Serialization.FULL_FORMATTER.format(record.getDataFineScavo())); + centroidsRow.put(DBConstants.Concessioni.DATE_SCAVO,Serialization.FULL_FORMATTER.format(record.getDataFineProgetto())); centroidsRow.put(DBConstants.Concessioni.DATA_ARCHIVIAZIONE,Serialization.FULL_FORMATTER.format(record.getLastUpdateTime())); centroidsRow.put(DBConstants.Concessioni.VERSIONE,record.getVersion()); centroidsRow.put(DBConstants.Concessioni.LICENZA,record.getLicenzaID()); diff --git a/src/main/java/org/gcube/application/geoportal/model/concessioni/Concessione.java b/src/main/java/org/gcube/application/geoportal/model/concessioni/Concessione.java index 2fdc75c..b149c15 100644 --- a/src/main/java/org/gcube/application/geoportal/model/concessioni/Concessione.java +++ b/src/main/java/org/gcube/application/geoportal/model/concessioni/Concessione.java @@ -47,7 +47,7 @@ public class Concessione extends Record{ private String responsabile; private String editore; - private List fontiFinanaziamento; + private List fontiFinanziamento; //Research Excavation; Archaeology (valori di default) private List soggetto; @@ -57,8 +57,8 @@ public class Concessione extends Record{ private List risorseCorrelate; - private Instant dataInizioScavo; - private Instant dataFineScavo; + private Instant dataInizioProgetto; + private Instant dataFineProgetto; private String titolareLicenza; private String titolareCopyright; @@ -132,7 +132,7 @@ public class Concessione extends Record{ // result = prime * result + ((authors == null) ? 0 : authors.hashCode()); result = prime * result + CollectionsUtils.hashCode(authors); // result = prime * result + ((fontiFinanaziamento == null) ? 0 : fontiFinanaziamento.hashCode()); - result = prime * result + CollectionsUtils.hashCode(fontiFinanaziamento); + result = prime * result + CollectionsUtils.hashCode(fontiFinanziamento); // result = prime * result + ((immaginiRappresentative == null) ? 0 : immaginiRappresentative.hashCode()); result = prime * result + CollectionsUtils.hashCode(immaginiRappresentative); // result = prime * result + ((paroleChiaveICCD == null) ? 0 : paroleChiaveICCD.hashCode()); @@ -151,8 +151,8 @@ public class Concessione extends Record{ result = prime * result + ((centroidLat == null) ? 0 : centroidLat.hashCode()); result = prime * result + ((centroidLong == null) ? 0 : centroidLong.hashCode()); result = prime * result + ((contributore == null) ? 0 : contributore.hashCode()); - result = prime * result + ((dataFineScavo == null) ? 0 : dataFineScavo.hashCode()); - result = prime * result + ((dataInizioScavo == null) ? 0 : dataInizioScavo.hashCode()); + result = prime * result + ((dataFineProgetto == null) ? 0 : dataFineProgetto.hashCode()); + result = prime * result + ((dataInizioProgetto == null) ? 0 : dataInizioProgetto.hashCode()); result = prime * result + ((descrizioneContenuto == null) ? 0 : descrizioneContenuto.hashCode()); result = prime * result + ((editore == null) ? 0 : editore.hashCode()); result = prime * result + ((genericContent == null) ? 0 : genericContent.hashCode()); @@ -188,7 +188,7 @@ public class Concessione extends Record{ // return false; // } else if (!fontiFinanaziamento.equals(other.fontiFinanaziamento)) // return false; - if (!CollectionsUtils.equalsCollections(fontiFinanaziamento, other.fontiFinanaziamento)) return false; + if (!CollectionsUtils.equalsCollections(fontiFinanziamento, other.fontiFinanziamento)) return false; // if (immaginiRappresentative == null) { // if (other.immaginiRappresentative != null) @@ -255,15 +255,15 @@ public class Concessione extends Record{ return false; } else if (!contributore.equals(other.contributore)) return false; - if (dataFineScavo == null) { - if (other.dataFineScavo != null) + if (dataFineProgetto == null) { + if (other.dataFineProgetto != null) return false; - } else if (!dataFineScavo.equals(other.dataFineScavo)) + } else if (!dataFineProgetto.equals(other.dataFineProgetto)) return false; - if (dataInizioScavo == null) { - if (other.dataInizioScavo != null) + if (dataInizioProgetto == null) { + if (other.dataInizioProgetto != null) return false; - } else if (!dataInizioScavo.equals(other.dataInizioScavo)) + } else if (!dataInizioProgetto.equals(other.dataInizioProgetto)) return false; if (descrizioneContenuto == null) { if (other.descrizioneContenuto != null) diff --git a/src/main/java/org/gcube/application/geoportal/storage/ContentHandler.java b/src/main/java/org/gcube/application/geoportal/storage/ContentHandler.java index dc1b79c..a9cd8d3 100644 --- a/src/main/java/org/gcube/application/geoportal/storage/ContentHandler.java +++ b/src/main/java/org/gcube/application/geoportal/storage/ContentHandler.java @@ -146,11 +146,29 @@ public class ContentHandler { } - public void publishContent() { - log.debug("Publishing content into SDI "); - //TODO - } - +// public void publishContent() { +// log.debug("Publishing updated content into SDI "); +// //TODO +// for(Entry> entry:uploadedResources.entrySet()) { +// AssociatedContent content=entry.getKey(); +// +// if (content instanceof SDILayerDescriptor) { +// //SDI Section +// SDILayerDescriptor layer=(SDILayerDescriptor)content; +// log.debug("Publishing "+layer); +// if(content instanceof LayerConcessione) { +// // Upload Files to geoserver +// +// +// }else throw new Exception("Invalid SDI Content "+content); +// +// } +// } +// +// +// +// } +// @Override protected void finalize() throws Throwable { diff --git a/src/test/java/org/gcube/application/geoportal/TestModel.java b/src/test/java/org/gcube/application/geoportal/TestModel.java index 8acbd79..0f02dcd 100644 --- a/src/test/java/org/gcube/application/geoportal/TestModel.java +++ b/src/test/java/org/gcube/application/geoportal/TestModel.java @@ -39,15 +39,15 @@ public class TestModel { concessione.setResponsabile("Someone"); concessione.setEditore("Editore"); - concessione.setFontiFinanaziamento(Arrays.asList(new String[] {"Big pharma","Pentagon"})); + concessione.setFontiFinanziamento(Arrays.asList(new String[] {"Big pharma","Pentagon"})); concessione.setSoggetto(Arrays.asList(new String[] {"Research Excavation","Archeology"})); - concessione.setDataInizioScavo(Instant.now()); - concessione.setDataFineScavo(Instant.now()); + concessione.setDataInizioProgetto(Instant.now()); + concessione.setDataFineProgetto(Instant.now()); concessione.setTitolareLicenza("Qualcun altro"); concessione.setTitolareCopyright("Chiedilo in giro");