Merge branch 'Sprint/2020-19' into 'master'

Sprint/2020 19

See merge request coscine/api/metadata!23

src/Controllers/MetadataController.cs

@@ -45,7 +45,12 @@ namespace Coscine.Api.Metadata.Controllers
 
             var graph = _rdfStoreConnector.GetGraph(profileUrl);
 
-            var json = JToken.Parse(VDS.RDF.Writing.StringWriter.Write(graph, new RdfJsonWriter()));
+            var tripleStore = new TripleStore();
+            tripleStore.Add(graph);
+
+            var outStoreJson = VDS.RDF.Writing.StringWriter.Write(tripleStore, new JsonLdWriter());
+
+            var json = JToken.Parse(outStoreJson);
 
             return Ok(json);
         }
@@ -72,7 +77,12 @@ namespace Coscine.Api.Metadata.Controllers
 
             graph.Merge(fixedValuesGraph);
 
-            var json = JToken.Parse(VDS.RDF.Writing.StringWriter.Write(graph, new RdfJsonWriter()));
+            var tripleStore = new TripleStore();
+            tripleStore.Add(graph);
+
+            var outStoreJson = VDS.RDF.Writing.StringWriter.Write(tripleStore, new JsonLdWriter());
+
+            var json = JToken.Parse(outStoreJson);
 
             return Ok(json);
 

src/Metadata.csproj

@@ -62,8 +62,8 @@
     <Reference Include="Coscine.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
       <HintPath>packages\Coscine.Logging.1.2.0\lib\net461\Coscine.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Coscine.Metadata, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Coscine.Metadata.1.3.1\lib\net461\Coscine.Metadata.dll</HintPath>
+    <Reference Include="Coscine.Metadata, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Coscine.Metadata.1.3.2\lib\net461\Coscine.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="dotNetRDF, Version=2.5.0.0, Culture=neutral, PublicKeyToken=6055ffe4c97cc780, processorArchitecture=MSIL">
       <HintPath>packages\dotNetRDF.2.5.0\lib\net40\dotNetRDF.dll</HintPath>

src/packages.config

@@ -6,7 +6,7 @@
   <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
   <package id="Coscine.Database" version="1.22.2" targetFramework="net461" />
   <package id="Coscine.Logging" version="1.2.0" targetFramework="net461" />
-  <package id="Coscine.Metadata" version="1.3.1" targetFramework="net461" />
+  <package id="Coscine.Metadata" version="1.3.2" targetFramework="net461" />
   <package id="dotNetRDF" version="2.5.0" targetFramework="net461" />
   <package id="dotNetRDF.Data.Virtuoso" version="2.5.0" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />