gCubeSystem
/
resource-registry
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing issues

This commit is contained in:
Luca Frosini 2024-11-05 18:32:57 +01:00
parent 4fe825cbfb
commit 0ead00f884
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/informationsystem/resourceregistry/base/ElementManagement.java
View File

@ -259,7 +259,7 @@ public abstract class ElementManagement<El extends OElement, T extends Type> {
protected Environment getWorkingEnvironment() throws ResourceRegistryException {
if(workingEnvironment == null) {
workingEnvironment = ContextUtility.getCurrentRequestEnvironment();
Context context = ServerContextCache.getInstance().getContextByUUID(workingEnvironment.getUUID());
Context context = ServerContextCache.getInstance().getFullInfoContextByUUID(workingEnvironment.getUUID());
String state = context.getState();
if(state.compareTo(ContextState.ACTIVE.getState())!=0) {
Set<String> allowedRoles = workingEnvironment.getAllowedRoles();

30
src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ServerContextCache.java
View File

@ -10,6 +10,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import java.util.UUID;
import javax.ws.rs.InternalServerErrorException;
import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
@ -117,6 +119,11 @@ public class ServerContextCache extends ContextCache {
}
}
public synchronized Context getFullInfoContextByUUID(UUID uuid) throws ResourceRegistryException {
refreshContextsIfNeeded();
return uuidToContext.get(uuid);
}
@Override
public synchronized Context getContextByUUID(UUID uuid) throws ResourceRegistryException {
refreshContextsIfNeeded();
@ -171,9 +178,10 @@ public class ServerContextCache extends ContextCache {
for(Context c : contexts) {
UUID uuid = c.getID();
Context contextWithMeta = new ContextImpl(c.getName());
contextWithMeta.setMetadata(c.getMetadata());
contextWithMeta.setID(uuid);
try {
String contextString = ElementMapper.marshal(c);
Context contextWithMeta = ElementMapper.unmarshal(Context.class, contextString);
this.contexts.add(contextWithMeta);
this.uuidToContext.put(uuid, contextWithMeta);
@ -190,6 +198,22 @@ public class ServerContextCache extends ContextCache {
this.contextsBasicInfo.add(contextNoMeta);
this.uuidToContextBasicInfo.put(uuid, contextNoMeta);
/*
Context contextMetaPrivacy = ElementMapper.unmarshal(Context.class, contextString);
Metadata metadataWithPrivacy = getMetadataForPrivacy(objectMapper, c.getMetadata());
contextMetaPrivacy.setMetadata(metadataWithPrivacy);
this.contextsMetaPrivacy.add(contextMetaPrivacy);
this.uuidToContextMetaPrivacy.put(uuid, contextMetaPrivacy);
Context contextNoMeta = ElementMapper.unmarshal(Context.class, contextString);
contextNoMeta.setMetadata(null);
this.contextsBasicInfo.add(contextNoMeta);
this.uuidToContextBasicInfo.put(uuid, contextNoMeta);
*/
}catch (Exception e) {
throw new InternalServerErrorException("Error while creating context Cache", e);
}
}
for(Context c : contexts) {