gCubeSystem
/
grsf-publisher
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing code

This commit is contained in:
Luca Frosini 2024-03-27 16:30:53 +01:00
parent 5292cc6967
commit 67f7aed1c2
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/grsf/publisher/ckan/record/Record.java
View File

@ -91,8 +91,6 @@ public abstract class Record extends CKANPackage {
protected Set<FileContainer> wsUploadedFiles; protected Set<FileContainer> wsUploadedFiles;
protected GRSFCatalogueConfiguration configuration;
public Record() { public Record() {
super(GRSFCatalogueConfigurationFactory.getInstance()); super(GRSFCatalogueConfigurationFactory.getInstance());
this.objectMapper = new ObjectMapper(); this.objectMapper = new ObjectMapper();
@ -254,7 +252,7 @@ public abstract class Record extends CKANPackage {
String recordURL = uriResolver.getCatalogueItemURL(grsfUUID); String recordURL = uriResolver.getCatalogueItemURL(grsfUUID);
map.put(RECORD_URL_TEMPLATE_PROPERTY_KEY, recordURL); map.put(RECORD_URL_TEMPLATE_PROPERTY_KEY, recordURL);
map.put(INCLUDE_SENSITIVE_TEMPLATE_PROPERTY_KEY, configuration.isIncludeSensitive()); map.put(INCLUDE_SENSITIVE_TEMPLATE_PROPERTY_KEY, ((GRSFCatalogueConfiguration) configuration).isIncludeSensitive());
map.put(IS_PATCH_TEMPLATE_PROPERTY_KEY, patch); map.put(IS_PATCH_TEMPLATE_PROPERTY_KEY, patch);

1
src/main/java/org/gcube/grsf/publisher/configuration/GRSFCatalogueConfiguration.java
View File

@ -3,7 +3,6 @@ package org.gcube.grsf.publisher.configuration;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration; import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
import org.gcube.grsf.publisher.utils.OrganizationUtils; import org.gcube.grsf.publisher.utils.OrganizationUtils;

3
src/main/java/org/gcube/grsf/publisher/configuration/isproxies/impl/GRSFFacetBasedISConfigurationProxy.java
View File

@ -60,7 +60,8 @@ public class GRSFFacetBasedISConfigurationProxy extends FacetBasedISConfiguratio
try { try {
ServiceCatalogueConfiguration scc = super.readFromIS(); ServiceCatalogueConfiguration scc = super.readFromIS();
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
GRSFCatalogueConfiguration grsfCC = objectMapper.treeToValue(objectMapper.valueToTree(scc), GRSFCatalogueConfiguration.class); String json = objectMapper.writeValueAsString(scc);
GRSFCatalogueConfiguration grsfCC = objectMapper.readValue(json, GRSFCatalogueConfiguration.class);
return grsfCC; return grsfCC;
}catch (Exception e) { }catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);

3
src/main/java/org/gcube/grsf/publisher/configuration/isproxies/impl/GRSFGCoreISConfigurationProxy.java
View File

@ -19,7 +19,8 @@ public class GRSFGCoreISConfigurationProxy extends GCoreISConfigurationProxy {
try { try {
ServiceCatalogueConfiguration scc = super.readFromIS(); ServiceCatalogueConfiguration scc = super.readFromIS();
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
GRSFCatalogueConfiguration grsfCC = objectMapper.treeToValue(objectMapper.valueToTree(scc), GRSFCatalogueConfiguration.class); String json = objectMapper.writeValueAsString(scc);
GRSFCatalogueConfiguration grsfCC = objectMapper.readValue(json, GRSFCatalogueConfiguration.class);
return grsfCC; return grsfCC;
}catch (Exception e) { }catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);