Merge pull request #293 from ulitol97/master

Minor changes
weso · Mar 3, 2022 · bf23162 · bf23162
2 parents 06fa350 + 8178ede
commit bf23162
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...ain/scala/es/weso/rdfshape/server/api/routes/schema/logic/operations/SchemaValidate.scala b/...ain/scala/es/weso/rdfshape/server/api/routes/schema/logic/operations/SchemaValidate.scala
@@ -111,7 +111,7 @@ private[api] object SchemaValidate extends LazyLogging {
         case other =>
           IO.raiseError(
             new RuntimeException(
-              s"Unexpected validation trigger (${other._type})"
+              s"Unexpected validation trigger (${other.`type`})"
             )
           )
       }

diff --git a/.../src/main/scala/es/weso/rdfshape/server/api/routes/schema/logic/trigger/TriggerMode.scala b/.../src/main/scala/es/weso/rdfshape/server/api/routes/schema/logic/trigger/TriggerMode.scala
@@ -17,7 +17,7 @@ trait TriggerMode {
 
   /** Corresponding type of this adapter inside [[ValidationTrigger]]
     */
-  val _type: TriggerModeType
+  val `type`: TriggerModeType
 
   /** Optionally, the [[Data]] being validated in the validation using this trigger
     */

diff --git a/.../main/scala/es/weso/rdfshape/server/api/routes/schema/logic/trigger/TriggerShapeMap.scala b/.../main/scala/es/weso/rdfshape/server/api/routes/schema/logic/trigger/TriggerShapeMap.scala
@@ -35,7 +35,7 @@ sealed case class TriggerShapeMap(
     * @return A ShapeMap instance used by WESO libraries in validation
     */
   lazy val innerShapeMap: Either[String, ShapeMapW] = shapeMap.innerShapeMap
-  override val _type: TriggerModeType               = TriggerModeType.SHAPEMAP
+  override val `type`: TriggerModeType              = TriggerModeType.SHAPEMAP
 
   // Fetched shapeMap successfully
   assume(
@@ -107,7 +107,7 @@ private[api] object TriggerShapeMap
   override implicit val encode: Encoder[TriggerShapeMap] =
     (tsm: TriggerShapeMap) =>
       Json.obj(
-        ("type", tsm._type.asJson),
+        ("type", tsm.`type`.asJson),
         ("shapeMap", tsm.shapeMap.asJson),
         ("data", tsm.data.asJson),
         ("schema", tsm.schema.asJson)

diff --git a/...a/es/weso/rdfshape/server/api/routes/schema/logic/trigger/TriggerTargetDeclarations.scala b/...a/es/weso/rdfshape/server/api/routes/schema/logic/trigger/TriggerTargetDeclarations.scala
@@ -18,7 +18,7 @@ sealed case class TriggerTargetDeclarations private (
 ) extends TriggerMode
     with LazyLogging {
 
-  override val _type: TriggerModeType =
+  override val `type`: TriggerModeType =
     TriggerModeType.TARGET_DECLARATIONS
 
   override def getValidationTrigger: ValidationTrigger =
@@ -38,7 +38,7 @@ private[api] object TriggerTargetDeclarations
   override implicit val encode: Encoder[TriggerTargetDeclarations] =
     (tsm: TriggerTargetDeclarations) =>
       Json.obj(
-        ("type", tsm._type.asJson),
+        ("type", tsm.`type`.asJson),
         ("data", tsm.data.asJson),
         ("schema", tsm.schema.asJson)
       )

diff --git a/modules/server/src/main/scala/es/weso/rdfshape/server/api/swagger/package.scala b/modules/server/src/main/scala/es/weso/rdfshape/server/api/swagger/package.scala
@@ -114,7 +114,7 @@ package object swagger {
     ),
     host = "api.rdfshape.weso.es".some,
     basePath = s"/$api".some, // All routes are prefixed by "/api"
-    schemes = List(Scheme.HTTPS),
+    schemes = List(Scheme.HTTP, Scheme.HTTPS),
     consumes = List("application/json"),
     produces = List("text/plain; charset=utf-8", "application/json")
   )