diff --git a/CHANGELOG.md b/CHANGELOG.md index 06f5df4..61bf2bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm #### Enhancements [#20595] Move the beans used in the view part into geoportal-data-common +[#20435] Client integration with MongoConcessioni ## [v1.1.0] - 2020-12-21 diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java index 65db888..13ffaf4 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/server/GeoportalDataViewerServiceImpl.java @@ -1,14 +1,16 @@ package org.gcube.portlets.user.geoportaldataviewer.server; +import static org.gcube.application.geoportal.client.GeoportalAbstractPlugin.mongoConcessioni; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.gcube.application.geoportal.client.legacy.ConcessioniManager; import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.legacy.UploadedImage; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; import org.gcube.application.geoportalcommon.ConvertToDataViewModel; import org.gcube.application.geoportalcommon.GeoNaDataViewerProfileReader; import org.gcube.application.geoportalcommon.GeoportalCommon; @@ -186,8 +188,8 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme if(itemType.equalsIgnoreCase("concessione")) { LOG.info("Trying to get concessione for id "+id); - ConcessioniManager concessioniManager = new ConcessioniManager(); - Concessione concessione = concessioniManager.getById(id+""); + MongoConcessioni mongoConcessioni = mongoConcessioni().build(); + Concessione concessione = mongoConcessioni.getById(id+""); if (concessione != null) { LOG.info("For id "+id+", got concessione "+concessione.getNome() +" from service"); List images = concessione.getImmaginiRappresentative(); @@ -234,7 +236,8 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme try { LOG.info("Trying to get record for id "+id); SessionUtil.getCurrentContext(this.getThreadLocalRequest(), true); - Concessione concessione = new ConcessioniManager().getById(id+""); + MongoConcessioni mongoConcessioni = mongoConcessioni().build(); + Concessione concessione = mongoConcessioni.getById(id+""); LOG.info("Got concessione for id "+id); if(concessione !=null) { concessionDV = ConvertToDataViewModel.toConcessione(concessione); diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java index 5bf0b80..b4ffa32 100644 --- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java +++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GetConcessione.java @@ -1,7 +1,8 @@ package org.gcube.portlets.user.geoportaldataviewer; -import org.gcube.application.geoportal.client.legacy.ConcessioniManager; +import static org.gcube.application.geoportal.client.GeoportalAbstractPlugin.mongoConcessioni; import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; import org.gcube.application.geoportalcommon.ConvertToDataViewModel; import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; @@ -28,7 +29,8 @@ public class GetConcessione { try { LOG.info("Trying to get record for id "+id); - Concessione concessione = new ConcessioniManager().getById(id+""); + MongoConcessioni mongoConcessioni = mongoConcessioni().build(); + Concessione concessione = mongoConcessioni.getById(id+""); LOG.info("For id "+id+", got concessione "+concessione); LOG.info("Immagini Rappresentative are: "+concessione.getImmaginiRappresentative()); LOG.info("Relazione scavo: "+concessione.getRelazioneScavo());