diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java index f7aa62c..06db1db 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/relations/RelationElementManagement.java @@ -189,7 +189,7 @@ public abstract class RelationElementManagement updateProperties(oClass, element, jsonNode, ignoreKeys, ignoreStartWithKeys); } - logger.info("Created {} is {}", OVertex.class.getSimpleName(), + logger.debug("Created {} is {}", OVertex.class.getSimpleName(), Utility.toJsonString((OVertex) element, true)); return element; @@ -349,7 +350,8 @@ public abstract class EntityManagement @Override public void addToContext(UUID contextUUID) throws SchemaViolationException, NotFoundException, ContextException, ResourceRegistryException { - logger.info("Going to add {} with UUID {} to Context with UUID {}", accessType.getName(), uuid, contextUUID); + String contextFullName = ContextCache.getInstance().getContextFullNameByUUID(contextUUID); + logger.info("Going to add {} with UUID {} to Context with UUID {} (i.e. {})", accessType.getName(), uuid, contextUUID, contextFullName); ODatabaseDocument current = ContextUtility.getCurrentODatabaseDocumentFromThreadLocal(); try { workingContext = ContextUtility.getAdminSecurityContext(); @@ -367,15 +369,15 @@ public abstract class EntityManagement }else { oDatabaseDocument.rollback(); } - logger.info("{} with UUID {} successfully added to Context with UUID {}", typeName, uuid, contextUUID); + logger.info("{} with UUID {} successfully added to Context with UUID {} (i.e. {})", typeName, uuid, contextUUID, contextFullName); } catch(ResourceRegistryException e) { - logger.error("Unable to add {} with UUID {} to Context with UUID {} - Reason is {}", typeName, uuid, contextUUID, e.getMessage()); + logger.error("Unable to add {} with UUID {} to Context with UUID {} (i.e. {}) - Reason is {}", typeName, uuid, contextUUID, contextFullName, e.getMessage()); if(oDatabaseDocument != null) { oDatabaseDocument.rollback(); } throw e; } catch(Exception e) { - logger.error("Unable to add {} with UUID {} to Context with UUID {}", typeName, uuid, contextUUID, e); + logger.error("Unable to add {} with UUID {} to Context with UUID {} (i.e. {})", typeName, uuid, contextUUID, contextFullName, e); if(oDatabaseDocument != null) { oDatabaseDocument.rollback(); } diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java index 0c8bb87..687bd62 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java @@ -20,6 +20,7 @@ import org.gcube.informationsystem.model.reference.properties.PropagationConstra import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.RemoveConstraint; import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.model.reference.relations.Relation; +import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; @@ -258,7 +259,7 @@ public abstract class RelationManagement exten updateProperties(oClass, element, jsonNode, ignoreKeys, ignoreStartWithKeys); - logger.info("Created {} is {}", OVertex.class.getSimpleName(), Utility.toJsonString(element, true)); + logger.debug("Created {} is {}", OVertex.class.getSimpleName(), Utility.toJsonString(element, true)); return element; } catch (ResourceRegistryException e) { diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java index a6429ba..fb10b70 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/Utility.java @@ -105,7 +105,7 @@ public class Utility { if(resultSet == null || !resultSet.hasNext()) { String error = String.format("No %s with UUID %s was found", elementType, uuid.toString()); - logger.info(error); + logger.debug(error); throw new NotFoundException(error); } diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AddToContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AddToContextTest.java index 1aa9d78..fc1df13 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AddToContextTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/AddToContextTest.java @@ -2,19 +2,17 @@ package org.gcube.informationsystem.resourceregistry.instances.multicontext; import java.net.URI; import java.util.List; +import java.util.Set; import java.util.UUID; -import org.gcube.informationsystem.context.reference.entities.Context; import org.gcube.informationsystem.model.impl.properties.HeaderImpl; import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl; import org.gcube.informationsystem.model.reference.properties.Header; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.AddConstraint; import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.RemoveConstraint; -import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCacheRenewal; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; -import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaViolationException; import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility; import org.gcube.informationsystem.resourceregistry.contexts.entities.ContextManagement; @@ -159,60 +157,39 @@ public class AddToContextTest extends MultiContextTest { Dataset r1 = ElementMapper.unmarshal(Dataset.class, getResourceManagement(datasetR1).read()); @SuppressWarnings("unchecked") List contextsR1 = (List) r1.getHeader().getAdditionalProperty(Header.__CONTEXTS); - /* Set contextsR1UUID = org.gcube.informationsystem.resourceregistry.api.contexts.ContextUtility.getContextUUIDSet(contextsR1); Set contextsR1Fullname = org.gcube.informationsystem.resourceregistry.api.contexts.ContextUtility.getContextFullNameSet(contextsR1UUID); - logger.debug("{}", contextsR1Fullname); - */ + logger.info("Contexts of {} with UUID {} and Id {} are {}", Dataset.NAME, r1.getHeader().getUUID(), ((IdentifierFacet)r1.getIdentificationFacets().get(0)).getValue(), contextsR1Fullname); Assert.assertTrue(contextsR1.size()==r1Number); Dataset r2 = ElementMapper.unmarshal(Dataset.class, getResourceManagement(datasetR2).read()); @SuppressWarnings("unchecked") List contextsR2 = (List) r2.getHeader().getAdditionalProperty(Header.__CONTEXTS); - /* Set contextsR2UUID = org.gcube.informationsystem.resourceregistry.api.contexts.ContextUtility.getContextUUIDSet(contextsR2); Set contextsR2Fullname = org.gcube.informationsystem.resourceregistry.api.contexts.ContextUtility.getContextFullNameSet(contextsR2UUID); - logger.debug("{}", contextsR2Fullname); - */ + logger.info("Contexts of {} with UUID {} and Id {} are {}", Dataset.NAME, r2.getHeader().getUUID(), ((IdentifierFacet)r2.getIdentificationFacets().get(0)).getValue(), contextsR2Fullname); Assert.assertTrue(contextsR2.size()==r2Number); Dataset r3 = ElementMapper.unmarshal(Dataset.class, getResourceManagement(datasetR3).read()); @SuppressWarnings("unchecked") List contextsR3 = (List) r3.getHeader().getAdditionalProperty(Header.__CONTEXTS); - /* Set contextsR3UUID = org.gcube.informationsystem.resourceregistry.api.contexts.ContextUtility.getContextUUIDSet(contextsR3); Set contextsR3Fullname = org.gcube.informationsystem.resourceregistry.api.contexts.ContextUtility.getContextFullNameSet(contextsR3UUID); - logger.debug("{}", contextsR3Fullname); - */ + logger.info("Contexts of {} with UUID {} and Id {} are {}", Dataset.NAME, r3.getHeader().getUUID(), ((IdentifierFacet)r3.getIdentificationFacets().get(0)).getValue(), contextsR3Fullname); Assert.assertTrue(contextsR3.size()==r3Number); ContextUtility.getHierarchicalMode().set(false); ContextUtility.getIncludeInstanceContexts().set(false); } - protected ContextCacheRenewal contextCacheRenewal = new ContextCacheRenewal() { - - @Override - public List renew() throws ResourceRegistryException { - try { - ContextManagement contextManagement = new ContextManagement(); - String allString = contextManagement.all(false); - logger.trace(allString); - List all = ElementMapper.unmarshalList(Context.class, allString); - return all; - }catch (Exception e) { - throw new ResourceRegistryException(e); - } - } - - }; - - @Test public void testAddToContextFromDifferentSourceContext() throws Exception { - setContextByName(GCUBE); + /* Needed to init context cache */ + ContextManagement contextManagement = new ContextManagement(); + contextManagement.all(false); + Dataset datasetR1 = createDataset("R1", "da111111-dada-1111-1111-111111111111"); Dataset datasetR2 = null; Dataset datasetR3 = null; diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 49e0744..d70760d 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -9,8 +9,8 @@ - - + +