From c28f0dcd65f3f7378b124ad4a43d51d6d4501ce5 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 31 Aug 2022 11:20:24 +0200 Subject: [PATCH 01/13] Adding support for "FAO SDG 14.4.1 Questionnaire" source --- .settings/org.eclipse.core.resources.prefs | 1 + .../services/GrsfPublisherFisheryService.java | 2 +- .../services/GrsfPublisherStockService.java | 2 +- .../grsf_publish_ws/utils/CommonServiceUtils.java | 9 ++++----- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index f9fe345..839d647 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java index 47cb319..6f18db6 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java @@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset; * @author Costantino Perciante (ISTI - CNR) * @author Luca Frosini (ISTI - CNR) */ -@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource}/fishery/") +@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource|sdg14.4.1|SDG14.4.1}/fishery/") public class GrsfPublisherFisheryService { // the context diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java index f6d5850..0b78b47 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java @@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset; * @author Costantino Perciante (ISTI - CNR) * @author Luca Frosini (ISTI - CNR) */ -@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource}/stock/") +@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource|sdg14.4.1|SDG14.4.1}/stock/") public class GrsfPublisherStockService { // the context diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java index 727ebc6..6e10540 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java @@ -4,7 +4,6 @@ import java.beans.PropertyDescriptor; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -266,7 +265,7 @@ public class CommonServiceUtils { if(match) { StringBuffer stringBuffer = new StringBuffer(); if(prependSource) { - stringBuffer.append(source.toString()); + stringBuffer.append(source.getURLPath()); stringBuffer.append(" "); } if(groupNameOverValue.isEmpty()) { @@ -289,7 +288,7 @@ public class CommonServiceUtils { */ private static void addRecordToGroups(Set groups, Set sourcesList, Product_Type productType, Sources sourceInPath) { if(sourceInPath == Sources.GRSF) { - groups.add(getGroupId(Sources.GRSF.getOrigName())); // i.e. grsf_group + groups.add(getGroupId(Sources.GRSF.getURLPath())); // i.e. grsf_group }else { groups.add(getGroupId(Constants.SYSTEM_TYPE_LEGACY_RECORD)); // i.e. legacy_group } @@ -543,7 +542,7 @@ public class CommonServiceUtils { if(databaseSources!=null) { for(Resource source : databaseSources) { Sources sourceName = source.getName(); - sourcesList.add(sourceName.getOrigName().toLowerCase()); + sourcesList.add(sourceName.getURLPath()); } } } @@ -719,6 +718,6 @@ public class CommonServiceUtils { return Constants.GRSF_PRE_ORGANIZATION_NAME; } }else - return sourceInPath.getOrigName().toLowerCase(); + return sourceInPath.getURLPath(); } } \ No newline at end of file From d6d373a94ca2cac734f90899ef0d5398a100bdd1 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 31 Aug 2022 11:22:19 +0200 Subject: [PATCH 02/13] Added change in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1936172..b873306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v1.13.2-SNAPSHOT] - Migrated request to social-service-client [#23679] - +- Adding support for "FAO SDG 14.4.1 Questionnaire" source [#23670] ## [v1.13.1] From 044d2edd050e8f9f5096082b99e7350da8523b46 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 31 Aug 2022 12:03:39 +0200 Subject: [PATCH 03/13] Upgraded the version --- CHANGELOG.md | 8 +++++++- pom.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b873306..7dbd67c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,15 @@ 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). +## [v1.13.3-SNAPSHOT] + +- Adding support for "FAO SDG 14.4.1 Questionnaire" source [#23670] + + ## [v1.13.2-SNAPSHOT] - Migrated request to social-service-client [#23679] -- Adding support for "FAO SDG 14.4.1 Questionnaire" source [#23670] + ## [v1.13.1] @@ -15,6 +20,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Tag are added also to legacy records [#23216] - Fixed code which generated groups id from name [#23215] + ## [v1.13.0] ### Added diff --git a/pom.xml b/pom.xml index 4625317..2e6f1d1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.data-catalogue grsf-publisher-ws - 1.13.2-SNAPSHOT + 1.13.3-SNAPSHOT war grsf-publisher-ws Utility library to publish GRSF products on GRSF catalogue. From 490619efe79b5b824cbd4ba99f50049ae1eae585 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 31 Aug 2022 12:09:03 +0200 Subject: [PATCH 04/13] Upgraded grsf-common-library range --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e6f1d1..bbac056 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.gcube.data-catalogue grsf-common-library - [1-0-0, 2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) org.gcube.common From 3f29a00f05a53d40a5ec84e7560461aab087d624 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 2 Sep 2022 12:42:03 +0200 Subject: [PATCH 05/13] Added test for json deserialization --- .../grsf_publish_ws/TestJson.java | 39 +++++++++++++++++++ .../70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json | 34 ++++++++++++++++ src/test/resources/logback-test.xml | 19 +++++++++ 3 files changed, 92 insertions(+) create mode 100644 src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java create mode 100644 src/test/resources/70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json create mode 100644 src/test/resources/logback-test.xml diff --git a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java new file mode 100644 index 0000000..e9c9409 --- /dev/null +++ b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java @@ -0,0 +1,39 @@ +package org.gcube.data_catalogue.grsf_publish_ws; + +import java.io.File; +import java.io.IOException; +import java.net.URL; + +import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.StockRecord; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public class TestJson { + + private static final Logger logger = LoggerFactory.getLogger(Test.class); + + public File getResourcesDirectory() throws Exception { + URL logbackFileURL = TestJson.class.getClassLoader().getResource("logback-test.xml"); + File logbackFile = new File(logbackFileURL.toURI()); + File resourcesDirectory = logbackFile.getParentFile(); + return resourcesDirectory; + } + + @Test + public void testJsonDeserialization() throws Exception { + File jsonQueryFile = new File(getResourcesDirectory(), "70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json"); + ObjectMapper objectMapper = new ObjectMapper(); + // JsonNode jsonNode = objectMapper.readTree(jsonQueryFile); + StockRecord sr = objectMapper.readValue(jsonQueryFile, StockRecord.class); + logger.debug("{}", sr); + } + +} diff --git a/src/test/resources/70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json b/src/test/resources/70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json new file mode 100644 index 0000000..15d420c --- /dev/null +++ b/src/test/resources/70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json @@ -0,0 +1,34 @@ +{ + "stock_name" : "European hake - Southern Adriatic", + "license_id" : "CC-BY-SA-4.0", + "version" : 1.0, + "database_sources" : [ { + "name" : "FAO SDG 14.4.1 questionnaire", + "description" : "FAO SDG 14.4.1 questionnaire", + "url" : "https://www.fao.org/sustainable-development-goals/indicators/14.4.1/en/" + } ], + "stock_uri" : "https://github.com/grsf/resource/sdg_14_4_1/stock/70ae6895-7d3d-4f4a-86f9-bcb17d41bff6", + "grsf_uuid" : "70ae6895-7d3d-4f4a-86f9-bcb17d41bff6", + "short_name" : "European hake - Southern Adriatic", + "description" : "European hake - Southern Adriatic", + "grsf_type" : "assessment unit", + "species" : [ "Code: HKE, Classification System: ASFIS, Scientific Name: Merluccius merluccius" ], + "assessment_area" : [ "Code: 18, System: gfcm, Name: Southern Adriatic " ], + "source_of_information" : [ { + "name" : "https://www.fao.org/sustainable-development-goals/indicators/14.4.1/en/sdg-alb-1", + "description" : "", + "url" : "https://www.fao.org/sustainable-development-goals/indicators/14.4.1/en/sdg-alb-1" + } ], + "data_owner" : [ "Albania" ], + "assessment_methods" : [ "The official stock assessment concludes 'Overfished' with respect to abundance reference points. [Rep. Year or Assessment ID: 2019, Ref. Year: 2018]" ], + "connections_indicator" : "not connected", + "similarities_indicator" : "without similar records", + "landings" : [ { + "value" : "872", + "unit" : "Tonnes", + "reference_year" : 2018, + "reporting_year_or_assessment_id" : "2020", + "data_owner" : "Albania" + } ], + "citation" : "citation TBD" +} \ No newline at end of file diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml new file mode 100644 index 0000000..10cbe5a --- /dev/null +++ b/src/test/resources/logback-test.xml @@ -0,0 +1,19 @@ + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n + + + + + + + + + + + + \ No newline at end of file From 587c0971ad6c598c386d217ad1cc459107b88e1b Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 2 Sep 2022 12:47:01 +0200 Subject: [PATCH 06/13] Improved test --- .../org/gcube/data_catalogue/grsf_publish_ws/TestJson.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java index e9c9409..0edb4a0 100644 --- a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java +++ b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java @@ -1,7 +1,6 @@ package org.gcube.data_catalogue.grsf_publish_ws; import java.io.File; -import java.io.IOException; import java.net.URL; import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.StockRecord; @@ -9,7 +8,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -31,7 +29,8 @@ public class TestJson { public void testJsonDeserialization() throws Exception { File jsonQueryFile = new File(getResourcesDirectory(), "70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json"); ObjectMapper objectMapper = new ObjectMapper(); - // JsonNode jsonNode = objectMapper.readTree(jsonQueryFile); + JsonNode jsonNode = objectMapper.readTree(jsonQueryFile); + logger.debug("{}", jsonNode); StockRecord sr = objectMapper.readValue(jsonQueryFile, StockRecord.class); logger.debug("{}", sr); } From ca752576bce0884aa28a477926c8c18efdf832c8 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 2 Sep 2022 14:44:37 +0200 Subject: [PATCH 07/13] Added support for "Assessment Method" group --- .../grsf_publish_ws/json/input/record/StockRecord.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java index 04af637..dc2281d 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java @@ -46,6 +46,7 @@ public class StockRecord extends Common{ @JsonProperty(Constants.ASSESSMENT_METHODS_JSON_KEY) @CustomField(key=Constants.ASSESSMENT_METHODS_CUSTOM_KEY) + @Group(groupNameOverValue=Constants.ASSESSMENT_METHODS_CUSTOM_KEY, prependSourceToGroupName=false) private List assessmentMethods; @JsonProperty(Constants.FIRMS_ABUNDANCE_LEVEL_JSON_KEY) From dd8874178de4effed2827e1b945f617ed366dbce Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 2 Sep 2022 14:49:21 +0200 Subject: [PATCH 08/13] Fixed changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dbd67c..ee04ce9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v1.13.2-SNAPSHOT] - Migrated request to social-service-client [#23679] +- Added "Assessment Methods" as Group ## [v1.13.1] From 9f182ededd0be40c3161187bd45e147050881095 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 2 Sep 2022 14:52:52 +0200 Subject: [PATCH 09/13] fixed changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee04ce9..1e4d29c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v1.13.2-SNAPSHOT] - Migrated request to social-service-client [#23679] -- Added "Assessment Methods" as Group +- Added "Assessment Methods" as Group [#] ## [v1.13.1] From 0fd88f657cda1bd95283d9d3e14eced1ba03f349 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 2 Sep 2022 14:53:07 +0200 Subject: [PATCH 10/13] Fixed changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e4d29c..26578db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v1.13.2-SNAPSHOT] - Migrated request to social-service-client [#23679] -- Added "Assessment Methods" as Group [#] +- Added "Assessment Methods" as Group [#23409] ## [v1.13.1] From 98eda28a8e195e3949ef3d1e64d03423697be32b Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 9 Sep 2022 16:22:53 +0200 Subject: [PATCH 11/13] Fixed project --- .settings/org.eclipse.core.resources.prefs | 1 + 1 file changed, 1 insertion(+) diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 839d647..29abf99 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -2,4 +2,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 From 9f8e8a5f5edda4f2a65c6fc10605b7075f4d8d59 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 9 Sep 2022 16:24:05 +0200 Subject: [PATCH 12/13] Changed sdg path --- .../grsf_publish_ws/services/GrsfPublisherFisheryService.java | 2 +- .../grsf_publish_ws/services/GrsfPublisherStockService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java index 6f18db6..37afba7 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java @@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset; * @author Costantino Perciante (ISTI - CNR) * @author Luca Frosini (ISTI - CNR) */ -@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource|sdg14.4.1|SDG14.4.1}/fishery/") +@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource|sdg|SDG}/fishery/") public class GrsfPublisherFisheryService { // the context diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java index 0b78b47..5ed7ef6 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java @@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset; * @author Costantino Perciante (ISTI - CNR) * @author Luca Frosini (ISTI - CNR) */ -@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource|sdg14.4.1|SDG14.4.1}/stock/") +@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource|sdg|SDG}/stock/") public class GrsfPublisherStockService { // the context From 84781a9a8d39ee4996050d2c0071230be75ae3b4 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 12 Sep 2022 10:24:30 +0200 Subject: [PATCH 13/13] Fixed bug on retriving email and fullname --- .../grsf_publish_ws/utils/HelperMethods.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java index c1a400a..c65b1ea 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java @@ -138,15 +138,15 @@ public abstract class HelperMethods { public static String getUserEmail(String context, String token) throws Exception{ // check in cache - String result = null; - if((result = (String) userEmailCache.get(token)) != null){ - return result; + String email = null; + if((email = (String) userEmailCache.get(token)) != null){ + return email; }else{ UserClient userClient = new UserClient(); - String email = userClient.getEmail(); + email = userClient.getEmail(); userEmailCache.insert(token, email); } - return result; + return email; } /** @@ -159,15 +159,15 @@ public abstract class HelperMethods { public static String getUserFullname(String context, String token) throws Exception{ // check in cache - String result = null; - if((result = (String) userFullnameCache.get(token)) != null){ - return result; + String fullName = null; + if((fullName = (String) userFullnameCache.get(token)) != null){ + return fullName; }else{ UserClient userClient = new UserClient(); - String fuulName = userClient.getFullName(); - userFullnameCache.insert(token, fuulName); + fullName = userClient.getFullName(); + userFullnameCache.insert(token, fullName); } - return result; + return fullName; } /**