From c44a8c851f655b2f47d9d96e4b5b4952c47f7543 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 6 May 2022 16:39:44 +0200 Subject: [PATCH] Fixes Coordinates parsing --- .../engine/bboxes/BBOXByCoordinatePaths.java | 2 +- .../cms/sdi/plugins/IndexerTest.java | 11 +++- .../profiledDocuments/profiles/sdiTests.json | 53 +++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 test-data/profiledDocuments/profiles/sdiTests.json diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java index df17e4f..7c4960e 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/bboxes/BBOXByCoordinatePaths.java @@ -36,7 +36,7 @@ public class BBOXByCoordinatePaths extends BBOXEvaluator{ @Override public GCubeSDILayer.BBOX evaluate(Document profileConfiguration, UseCaseDescriptor useCaseDescriptor, JSONPathWrapper documentNavigator) { - List coordsConfig=profileConfiguration.get("coordinatesPaths",List.class); + List coordsConfig=profileConfiguration.get("coordinatesPath",List.class); GCubeSDILayer.BBOX toSet = null; for(Object coordsObj:coordsConfig){ log.debug("UseCaseDescriptor {} : Evaluating coords {} ", useCaseDescriptor.getId(),coordsObj); diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java index b011c40..5beeb53 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java @@ -33,7 +33,12 @@ public class IndexerTest extends BasicPluginTest { @Test public void testIndexRequest() throws PluginExecutionException, JsonProcessingException { assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - Project doc= TestDocuments.documentMap.get("profiledConcessioniExample.json"); + UseCaseDescriptor ucd=TestProfiles.profiles.get("sdi-tests"); + Project doc= TestDocuments.documentMap.get("dummy.json"); + + doc.setProfileID(ucd.getId()); + doc.getTheDocument().put("coordX",10d); + doc.getTheDocument().put("coordY",11d); IndexDocumentRequest request=new IndexDocumentRequest(TestProfiles.profiles.get(doc.getProfileID()), getCurrentUser(),getTestContext(),doc); @@ -55,6 +60,10 @@ public class IndexerTest extends BasicPluginTest { } + + + + @Test public void getIndex() throws ConfigurationException, JsonProcessingException { assumeTrue(GCubeTest.isTestInfrastructureEnabled()); diff --git a/test-data/profiledDocuments/profiles/sdiTests.json b/test-data/profiledDocuments/profiles/sdiTests.json new file mode 100644 index 0000000..aeaed88 --- /dev/null +++ b/test-data/profiledDocuments/profiles/sdiTests.json @@ -0,0 +1,53 @@ +{ + "_id" : "sdi-tests", + "_version" : "1.0.0", + "_name" : "SDI Tests", + + "_description" : "Used for tests on sdi plugins", + "_creationInfo": { + "_user" : { + "_username": "fabio.sinibaldi" + } + }, + + "_schema" :{ "title" : {"_min" : 1}, + "section" : { "_max" : 1, "_min" : 1, + "_children" : [ + {"fileset" :{"_type" : "RegisteredFileSet", "_min": 1}}, + {"title" : {"_min" : 1}} + ] + } + }, + "_dataAccessPolicies" : [ + {"_policy" : {"_read" : "any", "_write" : "any"}, "_roles":[]} + ], + + + "_handlers" : [ + { + "_id" : "DEFAULT-SINGLE-STEP", + "_type" : "LifecycleManagement", + "_configuration" : { + "step_access" : [ + {"STEP" : "PUBLISH", "roles" :[]} + ] + } + }, + { + "_id": "SDI-Indexer-Plugin", + "_type": "Indexer", + "_configuration": { + "coordinatesPath" :[{"x" : "$._theDocument.coordX", "y" : "$._theDocument.coordY"}], + "explicitFieldMapping": [], + "additionalLayers": [ + { + "source": { + "url": "..." + }, + "toSetTitle": "" + } + ] + } + } + ] +} \ No newline at end of file