Skip to content

Commit 47e92a4

Browse files
authored
Merge pull request #173 from ulitol97/master
Minor changes
2 parents fd52303 + ae1a560 commit 47e92a4

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

modules/server/src/main/scala/es/weso/server/ApiHelper.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ private[server] def validate(rdf: RDFReasoner,
277277

278278
for {
279279
either <- result.attempt
280-
} yield either.fold(err => SchemaConversionResult.fromMsg(s"convertSchema: error: $err"), identity)
280+
} yield either.fold(err => SchemaConversionResult.fromMsg(s"error converting schema: $err"), identity)
281281
}
282282

283283
private[server] def shapeInfer(rdf: RDFReasoner,
@@ -467,4 +467,4 @@ private[server] def validate(rdf: RDFReasoner,
467467

468468
private[server] def mkJsonErr(msg: String) = Json.fromFields(List(("error", Json.fromString(msg))))
469469

470-
}
470+
}

modules/server/src/main/scala/es/weso/server/results/SchemaConversionResult.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ case class SchemaConversionResult(
2020
List(
2121
("msg", Json.fromString(msg)),
2222
) ++
23-
maybeField(schema,"schema", Json.fromString(_)) ++
24-
maybeField(schemaFormat,"schemaFormat", Json.fromString(_)) ++
25-
maybeField(schemaEngine,"schemaEngine", Json.fromString(_)) ++
26-
maybeField(targetSchemaFormat,"targetSchemaFormat", Json.fromString(_)) ++
27-
maybeField(targetSchemaEngine,"targetSchemaEngine", Json.fromString(_)) ++
28-
maybeField(result,"result", Json.fromString(_) ) ++
23+
maybeField(schema,"schema", Json.fromString) ++
24+
maybeField(schemaFormat,"schemaFormat", Json.fromString) ++
25+
maybeField(schemaEngine,"schemaEngine", Json.fromString) ++
26+
maybeField(targetSchemaFormat,"targetSchemaFormat", Json.fromString) ++
27+
maybeField(targetSchemaEngine,"targetSchemaEngine", Json.fromString) ++
28+
maybeField(result,"result", Json.fromString ) ++
2929
maybeField(resultShapeMap,"shapeMap", (sm: ShapeMap) => sm.toString.asJson)
3030
)
3131
}

0 commit comments

Comments
 (0)