From 4a44835356c197328eb72d6dbe3ae9deae932bfc Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 30 Mar 2023 12:10:29 +0200 Subject: [PATCH] Just including new dependencies --- .classpath | 6 +- .../com.gwtplugins.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 78 ++++++++++++-- CHANGELOG.md | 4 + pom.xml | 4 +- .../GeoportalViewer_Tests.java | 101 +++++++++--------- 6 files changed, 128 insertions(+), 67 deletions(-) diff --git a/.classpath b/.classpath index bd8a9e6..1e06bac 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 414cdfc..c7e650c 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.3.0-SNAPSHOT +lastWarOutDir=/home/francescomangiacrapa/git/geoportal-data-viewer-app/target/geoportal-data-viewer-app-3.3.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 256b7b3..05f594b 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + @@ -52,8 +52,18 @@ - - + + + + + + + + + + + + @@ -107,7 +117,12 @@ - + + + + + + @@ -161,7 +176,12 @@ - + + + + + + @@ -215,7 +235,12 @@ - + + + + + + @@ -269,7 +294,12 @@ - + + + + + + @@ -323,7 +353,18 @@ - + + + + uses + + + + + + + + @@ -377,7 +418,12 @@ - + + + + + + @@ -431,7 +477,12 @@ - + + + + + + @@ -485,7 +536,12 @@ - + + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index b043fdf..2628e88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.3.1-SNAPSHOT] - 2023-03-30 + +- Just including new dependencies + ## [v3.3.0] - 2023-02-20 #### Fixes diff --git a/pom.xml b/pom.xml index 1988192..2f6e6b6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user geoportal-data-viewer-app war - 3.3.0 + 3.3.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 @@ -55,7 +55,7 @@ org.gcube.distribution maven-portal-bom - 3.6.4 + 3.7.0-SNAPSHOT pom import diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java index d10e686..b7afce7 100644 --- a/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java +++ b/src/test/java/org/gcube/portlets/user/geoportaldataviewer/GeoportalViewer_Tests.java @@ -57,15 +57,15 @@ public class GeoportalViewer_Tests { private ProjectsCaller clientProjects; - //private static String CONTEXT = "/pred4s/preprod/preVRE"; - private static String CONTEXT = "/d4science.research-infrastructures.eu/D4OS/GNA"; - private static String TOKEN = ""; //GNA + private static String CONTEXT = "/gcube/devsec/devVRE"; + // private static String CONTEXT = "/pred4s/preprod/preVRE"; +// private static String CONTEXT = "/d4science.research-infrastructures.eu/D4OS/GNA"; + private static String TOKEN = ""; // GNA - //private static String CONTEXT = "/gcube/devsec/devVRE"; - //private static String TOKEN = ""; // devVRE + // private static String TOKEN = ""; // devVRE private static String PROFILE_ID = "profiledConcessioni"; - private static String PROJECT_ID = "6388ea6ca1e60e66b7b584e0"; + private static String PROJECT_ID = "63d011c4dcac4551b9a6b930"; private static String USERNAME = "francesco.mangiacrapa"; @@ -74,7 +74,7 @@ public class GeoportalViewer_Tests { * * @return the client */ - @Before + //@Before public void getClient() { // assumeTrue(GCubeTest.isTestInfrastructureEnabled()); ScopeProvider.instance.set(CONTEXT); @@ -103,7 +103,7 @@ public class GeoportalViewer_Tests { } } - //@Test + // @Test public void getLayersForId() { System.out.println("getLayersForId [profileID: " + PROFILE_ID + ", projectID: " + PROJECT_ID + "] called"); @@ -116,22 +116,23 @@ public class GeoportalViewer_Tests { Project project = clientProjects.getProjectByID(PROFILE_ID, PROJECT_ID); String jsonDocument = project.getTheDocument().toJson(); System.out.println("JSON Project is: " + jsonDocument); - + ACCESS_POLICY accessPolicy = GeportalCheckAccessPolicy.accessPolicyFromSessionLogin(null); - + String materializationParentJSONPath = null; - - if(accessPolicy.equals(ACCESS_POLICY.OPEN)) { - //Filtering for ACCESS_POLICY.OPEN when the username is not in session. IAM identity is running, no logged in user. - materializationParentJSONPath = String.format("%s..%s[?(@._access._policy=='%s')]", Geoportal_JSON_Mapper.JSON_$_POINTER, - Geoportal_JSON_Mapper.FILESET, accessPolicy); - }else { - //Accessing to all fileset (with any ACCESS_POLICY) when the user is logged in. + + if (accessPolicy.equals(ACCESS_POLICY.OPEN)) { + // Filtering for ACCESS_POLICY.OPEN when the username is not in session. IAM + // identity is running, no logged in user. + materializationParentJSONPath = String.format("%s..%s[?(@._access._policy=='%s')]", + Geoportal_JSON_Mapper.JSON_$_POINTER, Geoportal_JSON_Mapper.FILESET, accessPolicy); + } else { + // Accessing to all fileset (with any ACCESS_POLICY) when the user is logged in. materializationParentJSONPath = String.format("%s..%s", Geoportal_JSON_Mapper.JSON_$_POINTER, Geoportal_JSON_Mapper.FILESET); } - - System.out.println("jsonPathQuery is: "+materializationParentJSONPath); + + System.out.println("jsonPathQuery is: " + materializationParentJSONPath); // String materializationParentJSONPath = String.format("%s..%s", Geoportal_JSON_Mapper.JSON_$_POINTER, // Geoportal_JSON_Mapper.FILESET); @@ -238,7 +239,7 @@ public class GeoportalViewer_Tests { } } - //@Test + // @Test public void testReadProjectEdit() { try { @@ -261,7 +262,7 @@ public class GeoportalViewer_Tests { } } - //@Test + // @Test public void testTemporalReference() { try { ScopeProvider.instance.set(CONTEXT); @@ -270,8 +271,9 @@ public class GeoportalViewer_Tests { Document temporalJsonTemplate = GeoportalClientCaller.useCaseDescriptors() .readTemporalDimensionTemplate(theProject.getProfileID()); - // String template = "{\"content\": \"$.nome\"," + "\"title\": \"$.nome\"," - // + "\"start\" : \"$.dataInizioProgetto\"," + "\"end\" : \"$.dataFineProgetto\"}"; + // String template = "{\"content\": \"$.nome\"," + "\"title\": \"$.nome\"," + // + "\"start\" : \"$.dataInizioProgetto\"," + "\"end\" : + // \"$.dataFineProgetto\"}"; if (temporalJsonTemplate != null) { @@ -291,14 +293,13 @@ public class GeoportalViewer_Tests { e.printStackTrace(); } } - - //@Test + // @Test public void getResultsWithSize() throws Exception { // List listOfProjects = client.getListForProfileID(PROFILE_ID); long start = System.currentTimeMillis(); - System.out.println("start at: "+start); + System.out.println("start at: " + start); SearchingFilter filter = new SearchingFilter(); // Where Clause @@ -310,32 +311,32 @@ public class GeoportalViewer_Tests { conditions.add(whereClause); filter.setConditions(conditions); - //NEED TO GET projections - - //SETTING PROJECTION ONLY FOR PROEJCT ID + // NEED TO GET projections + + // SETTING PROJECTION ONLY FOR PROEJCT ID LinkedHashMap projectionForIDs = new LinkedHashMap(); projectionForIDs.put(Project.ID, 1); filter.setProjection(projectionForIDs); - - //LIMIT IS NULL MEANS THAT IT IS EQUAL TO NUMBER TOTAL OF DOCUMENTS + + // LIMIT IS NULL MEANS THAT IT IS EQUAL TO NUMBER TOTAL OF DOCUMENTS Integer totalDocs = clientProjects.getTotalDocument(PROFILE_ID); Iterator projects = clientProjects.queryOnMongo(PROFILE_ID, totalDocs, 0, null, filter); - - //CALCULATING SIZE OF THE ITERATOR OF PROJECT IDs + + // CALCULATING SIZE OF THE ITERATOR OF PROJECT IDs Iterable itP = () -> projects; Stream targetStream = StreamSupport.stream(itP.spliterator(), false); List listProjectIDs = targetStream.map(Project::getId).collect(Collectors.toList()); - - System.out.println("Total Ids are: "+listProjectIDs.size()); - //listProjectIDs.stream().forEach(p -> System.out.println(p)); - + + System.out.println("Total Ids are: " + listProjectIDs.size()); + // listProjectIDs.stream().forEach(p -> System.out.println(p)); + long end = System.currentTimeMillis(); - System.out.println("IDS returned in ms: "+(end-start)); - - //RESETTIG FILTER AND PROJECT TO CLIENT QUERY + System.out.println("IDS returned in ms: " + (end - start)); + + // RESETTIG FILTER AND PROJECT TO CLIENT QUERY LinkedHashMap projection = new LinkedHashMap(); // default - //PROJECTION + // PROJECTION projection.put(Project.ID, 1); projection.put("_theDocument.nome", 1); projection.put("_profileID", 1); @@ -353,21 +354,21 @@ public class GeoportalViewer_Tests { projection.put("_theDocument.dataInizioProgetto", 1); filter.setProjection(projection); - - //Integer totalDocs = client.getTotalDocument(PROFILE_ID); + // Integer totalDocs = client.getTotalDocument(PROFILE_ID); Iterator itProjects = clientProjects.queryOnMongo(PROFILE_ID, totalDocs, 0, 50, filter); - + List results = ConvertToDataValueObjectModel.toListResultDocument(itProjects); int i = 0; for (ResultDocumentDV projectDV : results) { - System.out.println(++i + ") " + projectDV.getId() + " dataInizioProgetto: "+projectDV.getDocumentAsMap().get("dataInizioProgetto")); + System.out.println(++i + ") " + projectDV.getId() + " dataInizioProgetto: " + + projectDV.getDocumentAsMap().get("dataInizioProgetto")); } - - System.out.println("Result listed has size: "+results.size()); - + + System.out.println("Result listed has size: " + results.size()); + end = System.currentTimeMillis(); - System.out.println("Result listed in ms: "+(end-start)); - + System.out.println("Result listed in ms: " + (end - start)); + } }