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

Fixing log 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@133668 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-10-27 16:30:19 +00:00
parent 0bc16375b8
commit dc2e16777e
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImpl.java
View File

@ -159,7 +159,7 @@ public class ContextManagementImpl implements ContextManagement {
orientGraph.commit(); orientGraph.commit();
Vertex readContext = getContext(orientGraph, uuid); Vertex readContext = getContext(orientGraph, uuid);
logger.info("Context {} created", logger.info("Context created {}",
Utility.toJsonString((OrientVertex) readContext, true)); Utility.toJsonString((OrientVertex) readContext, true));
return Utility.toJsonString((OrientVertex) readContext, false); return Utility.toJsonString((OrientVertex) readContext, false);

31
src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImpl.java
View File

@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.gcube.informationsystem.model.embedded.Embedded;
import org.gcube.informationsystem.model.entity.Entity; import org.gcube.informationsystem.model.entity.Entity;
import org.gcube.informationsystem.model.entity.Facet; import org.gcube.informationsystem.model.entity.Facet;
import org.gcube.informationsystem.model.entity.Resource; import org.gcube.informationsystem.model.entity.Resource;
@ -231,11 +232,11 @@ public class SchemaManagementImpl implements SchemaManagement {
} }
} }
// orientGraphNoTx.commit();
OClass oClass = getTypeSchema(typeDefinition.getName(), null); OClass oClass = getTypeSchema(typeDefinition.getName(), null);
return serializeOClass(oClass); String ret = serializeOClass(oClass);
logger.info("{} type registered successfully: {}", baseType, jsonSchema);
return ret;
} catch (Exception e) { } catch (Exception e) {
throw new SchemaException(e); throw new SchemaException(e);
} finally { } finally {
@ -254,7 +255,7 @@ public class SchemaManagementImpl implements SchemaManagement {
OrientGraphNoTx orientGraphNoTx = null; OrientGraphNoTx orientGraphNoTx = null;
try { try {
logger.info("Trying to register {} {}", baseType, jsonSchema); logger.info("Trying to register {} type : {}", baseType, jsonSchema);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
TypeDefinition typeDefinition = mapper.readValue(jsonSchema, TypeDefinition typeDefinition = mapper.readValue(jsonSchema,
@ -313,10 +314,11 @@ public class SchemaManagementImpl implements SchemaManagement {
} }
} }
// orientGraphNoTx.commit();
OClass oClass = getTypeSchema(typeDefinition.getName(), null); OClass oClass = getTypeSchema(typeDefinition.getName(), null);
return serializeOClass(oClass); String ret = serializeOClass(oClass);
logger.info("{} type registered successfully: {}", baseType, jsonSchema);
return ret;
} catch (Exception e) { } catch (Exception e) {
throw new SchemaException(e); throw new SchemaException(e);
} finally { } finally {
@ -335,7 +337,7 @@ public class SchemaManagementImpl implements SchemaManagement {
OrientGraphNoTx orientGraphNoTx = null; OrientGraphNoTx orientGraphNoTx = null;
try { try {
logger.info("Trying to register {}", jsonSchema); logger.info("Trying to register {} type : {}", Embedded.NAME, jsonSchema);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
TypeDefinition typeDefinition = mapper.readValue(jsonSchema, TypeDefinition typeDefinition = mapper.readValue(jsonSchema,
@ -393,11 +395,12 @@ public class SchemaManagementImpl implements SchemaManagement {
ovp.setLinkedClass(linkedClass); ovp.setLinkedClass(linkedClass);
} }
} }
oDatabaseDocumentTx.commit();
// orientGraphNoTx.commit();
String ret = serializeOClass(oClass);
return serializeOClass(oClass); logger.info("{} type registered successfully: {}", Embedded.NAME, jsonSchema);
return ret;
} catch (Exception e) { } catch (Exception e) {
throw new SchemaException(e); throw new SchemaException(e);
} finally { } finally {

1
src/test/resources/logback-test.xml
View File

@ -8,6 +8,7 @@
<logger name="org.gcube" level="TRACE" /> <logger name="org.gcube" level="TRACE" />
<logger name="org.gcube.informationsystem" level="INFO" />
<logger name="org.gcube.informationsystem.impl.utils.discovery" level="ERROR" /> <logger name="org.gcube.informationsystem.impl.utils.discovery" level="ERROR" />
<root level="WARN"> <root level="WARN">