diff --git a/.classpath b/.classpath index 8de1097..5cc23e2 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -35,5 +35,5 @@ - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index d98647e..b33f01f 100644 --- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -1,4 +1,4 @@ eclipse.preferences.version=1 -lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.2.0-SNAPSHOT +lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.2.1-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 79712e1..ca68d4b 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + @@ -46,8 +46,10 @@ - - + + + + @@ -95,7 +97,8 @@ - + + @@ -143,7 +146,8 @@ - + + @@ -191,7 +195,8 @@ - + + @@ -239,7 +244,8 @@ - + + @@ -287,7 +293,11 @@ - + + uses + + + @@ -335,7 +345,8 @@ - + + @@ -383,7 +394,8 @@ - + + @@ -431,7 +443,8 @@ - + + diff --git a/CHANGELOG.md b/CHANGELOG.md index a1d34d3..1534b54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v3.2.1-SNAPSHOT] - 2023-02-03 + +#### Fixes + +- [#24432] Reverting serialization LinkedHashMap to LinkedHashMap. + + ## [v3.2.0] - 2023-01-31 #### Enhancements diff --git a/pom.xml b/pom.xml index b9bdffc..326d1c0 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user geoportal-data-viewer-app war - 3.2.0 + 3.2.1-SNAPSHOT GeoPortal Data Viewer App The GeoPortal Data Viewer App is an application to access, discovery and navigate the Geoportal projects/documents by a Web-Map Interface diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java index b4d2e98..b1b4847 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerService.java @@ -159,7 +159,7 @@ public interface GeoportalDataViewerService extends RemoteService { * @param limit the limit * @return the entry sets document for project ID */ - LinkedHashMap getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit); + LinkedHashMap getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit); /** * Gets the relationships for timeline. diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java index 8a69080..3f3f7bb 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/GeoportalDataViewerServiceAsync.java @@ -70,7 +70,7 @@ public interface GeoportalDataViewerServiceAsync { void getInitialConfiguration(AsyncCallback callback); void getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit, - AsyncCallback> callback); + AsyncCallback> callback); void getRelationshipsForTimeline(String profileID, String projectID, AsyncCallback> callback); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java index 133246a..46553eb 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/LayerManager.java @@ -930,7 +930,7 @@ public class LayerManager { intFlex.setCellPadding(1); intFlex.setCellSpacing(1); if (projectDV.getTheDocument() != null) { - LinkedHashMap map = projectDV.getTheDocument().getDocumentAsMap(); + LinkedHashMap map = projectDV.getTheDocument().getDocumentAsMap(); // my-html-table // intFlex.getElement().addClassName("my-html-table"); int i = 0; @@ -1140,7 +1140,7 @@ public class LayerManager { intFlex.setCellPadding(1); intFlex.setCellSpacing(1); if (projectDV.getTheDocument() != null) { - LinkedHashMap map = projectDV.getTheDocument().getDocumentAsMap(); + LinkedHashMap map = projectDV.getTheDocument().getDocumentAsMap(); // my-html-table // intFlex.getElement().addClassName("my-html-table"); // int i = 0; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java index ff4e3df..6de4d13 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/ProjectUtil.java @@ -14,7 +14,7 @@ public class ProjectUtil { if (document == null) return htmlCode; - Entry firstEntrySet = document.getFirstEntryOfMap(); + Entry firstEntrySet = document.getFirstEntryOfMap(); if (firstEntrySet != null) { htmlCode += firstEntrySet.getKey() + ": " + firstEntrySet.getValue() + ""; } @@ -32,7 +32,7 @@ public class ProjectUtil { if (document == null) return htmlCode; - Entry firstEntrySet = document.getFirstEntryOfMap(); + Entry firstEntrySet = document.getFirstEntryOfMap(); if (firstEntrySet != null) { htmlCode += showkey ? firstEntrySet.getKey() + ": " + firstEntrySet.getValue() + "" : firstEntrySet.getValue(); @@ -51,7 +51,7 @@ public class ProjectUtil { if (document == null) return htmlCode; - Entry firstEntrySet = document.getFirstEntryOfMap(); + Entry firstEntrySet = document.getFirstEntryOfMap(); if (firstEntrySet != null) { htmlCode += firstEntrySet.getKey() + ": " + firstEntrySet.getValue() + ""; } diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/ViewRelationshipPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/ViewRelationshipPanel.java index 127e5ee..ed093a3 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/ViewRelationshipPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/cms/project/relation/ViewRelationshipPanel.java @@ -121,7 +121,7 @@ public class ViewRelationshipPanel extends Composite { firstProjectPanelContainer.clear(); secondProjectPanelContainer.clear(); - Entry firstEntrySet = project.getTheDocument().getFirstEntryOfMap(); + Entry firstEntrySet = project.getTheDocument().getFirstEntryOfMap(); String htmlMsg = firstEntrySet.getKey() + ": " + firstEntrySet.getValue() + " (id: " + project.getId() + ")"; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java index 1ade90d..281262b 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataviewer/client/ui/dandd/DragDropLayer.java @@ -101,10 +101,10 @@ public class DragDropLayer extends FlowPanel { labelProject.setTitle(referProjectID); GeoportalDataViewerServiceAsync.Util.getInstance().getEntrySetsDocumentForProjectID( layerObject.getProjectDV().getProfileID(), layerObject.getProjectDV().getId(), 1, - new AsyncCallback>() { + new AsyncCallback>() { @Override - public void onSuccess(LinkedHashMap result) { + public void onSuccess(LinkedHashMap result) { String realProjectName = ""; if (result != null) { for (String key : result.keySet()) { 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 1d3643d..2f6dcbe 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 @@ -1111,7 +1111,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme if (layerObject.getProjectDV().getTheDocument() == null) { try { - LinkedHashMap documentAsMap = getEntrySetsDocumentForProjectID( + LinkedHashMap documentAsMap = getEntrySetsDocumentForProjectID( layerObject.getProfileID(), layerObject.getProjectID(), 1); DocumentDV documentDV = new DocumentDV(); documentDV.setDocumentAsMap(documentAsMap); @@ -1207,7 +1207,7 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme }); if (loadDocument) { - LinkedHashMap theDocument = getEntrySetsDocumentForProjectID(profileID, projectID, + LinkedHashMap theDocument = getEntrySetsDocumentForProjectID(profileID, projectID, limitDocumentEntries); DocumentDV docDV = new DocumentDV(); docDV.setDocumentAsMap(theDocument); @@ -1256,11 +1256,11 @@ public class GeoportalDataViewerServiceImpl extends RemoteServiceServlet impleme * @return the entry sets document for project ID */ @Override - public LinkedHashMap getEntrySetsDocumentForProjectID(String profileID, String projectID, + public LinkedHashMap getEntrySetsDocumentForProjectID(String profileID, String projectID, int limit) { LOG.debug("called getEntrySetsDocumentForProjectID for profileID: " + profileID + ", projectID: " + projectID); - LinkedHashMap documentAsMap = new LinkedHashMap(limit); + LinkedHashMap documentAsMap = new LinkedHashMap(limit); try {