Merge pull request #1056 from aml-org/publish-4.7.6

Publish 4.7.6

amf-client/js/package.json

@@ -17,7 +17,7 @@
   "typings": "./typings/amf-client-js.d.ts",
   "dependencies": {
     "amf-shacl-node": "2.0.0",
-    "ajv": "6.5.2"
+    "ajv": "6.12.6"
   },
   "devDependencies": {
     "webpack": "^4.43.0",

amf-client/jvm/src/test/scala/amf/client/validation/JvmPayloadValidationTest.scala

@@ -1,14 +1,10 @@
 package amf.client.validation
 
 import amf.client.model.DataTypes
-import amf.client.model.domain.{NodeShape, ScalarShape}
+import amf.client.model.domain.ScalarShape
 import amf.convert.NativeOpsFromJvm
 import amf.core.AMF
 import amf.plugins.document.webapi.validation.PayloadValidatorPlugin
-import org.json.JSONException
-import org.scalatest.Matchers.a
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.Matchers._
 
 class JvmPayloadValidationTest extends ClientPayloadValidationTest with NativeOpsFromJvm {
   test("Test unexpected type error") {
@@ -41,4 +37,16 @@ class JvmPayloadValidationTest extends ClientPayloadValidationTest with NativeOp
       report.results.asSeq.head.message shouldBe "Regex defined in schema could not be processed"
     }
   }
+
+  test("Validation against a number with multipleOf 0 should throw violation") {
+    amf.Core.init().asFuture.flatMap { _ =>
+      amf.Core.registerPlugin(PayloadValidatorPlugin)
+      val shape                = new ScalarShape().withDataType(DataTypes.Number).withMultipleOf(0)
+      val validator            = shape.payloadValidator("application/json").asOption.get
+      val positiveNumberReport = validator.syncValidate("application/json", "5")
+      val zeroReport           = validator.syncValidate("application/json", "0")
+      positiveNumberReport.results.asSeq.head.message shouldBe "Can't divide by 0"
+      zeroReport.results.asSeq.head.message shouldBe "Can't divide by 0"
+    }
+  }
 }

amf-client/shared/src/test/resources/org/raml/parser/types/builtin/array/output.txt.js

@@ -17,7 +17,7 @@ employees[2].name should be string
   Location: file://amf-client/shared/src/test/resources/org/raml/parser/types/builtin/array/input.raml
 
 - Source: http://a.ml/vocabularies/amf/validation#example-validation-error
-  Message: should NOT have less than 2 items
+  Message: should NOT have fewer than 2 items
   Level: Violation
   Target: file://amf-client/shared/src/test/resources/org/raml/parser/types/builtin/array/input.raml#/declarations/types/array/Colors/example/bad-min
   Property: file://amf-client/shared/src/test/resources/org/raml/parser/types/builtin/array/input.raml#/declarations/types/array/Colors/example/bad-min

amf-client/shared/src/test/resources/org/raml/parser/types/min-and-max-properties/min-properties-error/output.txt.js

@@ -6,7 +6,7 @@ Number of results: 1
 Level: Violation
 
 - Source: http://a.ml/vocabularies/amf/validation#example-validation-error
-  Message: should NOT have less than 2 properties
+  Message: should NOT have fewer than 2 properties
   Level: Violation
   Target: file://amf-client/shared/src/test/resources/org/raml/parser/types/min-and-max-properties/min-properties-error/input.raml#/declarations/types/Initial_comments/example/default-example
   Property: file://amf-client/shared/src/test/resources/org/raml/parser/types/min-and-max-properties/min-properties-error/input.raml#/declarations/types/Initial_comments/example/default-example

amf-client/shared/src/test/resources/org/raml/parser/types/min-and-max-properties/with-additional-prop-error/output.txt.js

@@ -6,7 +6,7 @@ Number of results: 1
 Level: Violation
 
 - Source: http://a.ml/vocabularies/amf/validation#example-validation-error
-  Message: should NOT have less than 4 properties
+  Message: should NOT have fewer than 4 properties
   Level: Violation
   Target: file://amf-client/shared/src/test/resources/org/raml/parser/types/min-and-max-properties/with-additional-prop-error/input.raml#/declarations/types/Initial_comments/example/default-example
   Property: file://amf-client/shared/src/test/resources/org/raml/parser/types/min-and-max-properties/with-additional-prop-error/input.raml#/declarations/types/Initial_comments/example/default-example

amf-client/shared/src/test/resources/production/override-enum/api.raml

@@ -0,0 +1,14 @@
+#%RAML 1.0
+title: test API to be extended
+
+types:
+  TestObject:
+    type: object
+
+/test:
+  get:
+    responses:
+      200:
+        body:
+          application/json:
+            type: TestObject

amf-client/shared/src/test/resources/production/override-enum/extension.raml

@@ -0,0 +1,19 @@
+#%RAML 1.0 Extension
+extends: /api.raml
+types:
+  TestObject:
+    properties:
+      testObjectProperty:
+        enum:
+          - A
+          - B
+    example:
+        testObjectProperty: A
+
+/test:
+  get:
+    responses:
+      200:
+        body:
+          application/json:
+            type: TestObject

amf-client/shared/src/test/resources/production/override-enum/result.raml

@@ -0,0 +1,19 @@
+#%RAML 1.0
+title: test API to be extended
+/test:
+  get:
+    responses:
+      "200":
+        body:
+          application/json:
+            type: object
+            example:
+              testObjectProperty: A
+            additionalProperties: true
+            properties:
+              testObjectProperty:
+                enum:
+                  - A
+                  - B
+                type: string
+                required: true

amf-client/shared/src/test/resources/validations/duplicate-property/api.raml

@@ -0,0 +1,13 @@
+#%RAML 1.0
+title: test-duplicated-properties-raml10
+
+types:
+  test-duplicated-properties:
+    type: object
+    properties:
+      a: string
+      a?: string
+      b: string
+      b?: string
+      c: string
+      d: string

amf-client/shared/src/test/resources/validations/multiple-uses/library.raml

@@ -0,0 +1,2 @@
+#%RAML 1.0 Library
+

amf-client/shared/src/test/resources/validations/multiple-uses/multiple-uses.raml

@@ -0,0 +1,7 @@
+#%RAML 1.0
+title: test-multiple-uses-pointing-to-same-file
+version: 1.0
+
+uses:
+  first: library.raml
+  second: library.raml

amf-client/shared/src/test/resources/validations/reports/examples/array-items1.report.js

@@ -6,7 +6,7 @@ Number of results: 1
 Level: Violation
 
 - Source: http://a.ml/vocabularies/amf/validation#example-validation-error
-  Message: recipients should NOT have less than 1 items
+  Message: recipients should NOT have fewer than 1 items
   Level: Violation
   Target: file://amf-client/shared/src/test/resources/validations/examples/arrayItems1.raml#/web-api/end-points/%2Fnotifications%2Femails/post/request/application%2Fjson/schema/example/default-example
   Property: file://amf-client/shared/src/test/resources/validations/examples/arrayItems1.raml#/web-api/end-points/%2Fnotifications%2Femails/post/request/application%2Fjson/schema/example/default-example

amf-client/shared/src/test/resources/validations/reports/examples/min-max-items.report.js

@@ -6,7 +6,7 @@ Number of results: 2
 Level: Violation
 
 - Source: http://a.ml/vocabularies/amf/validation#example-validation-error
-  Message: should NOT have less than 2 items
+  Message: should NOT have fewer than 2 items
   Level: Violation
   Target: file://amf-client/shared/src/test/resources/validations/examples/min-max-items.raml#/declarations/types/array/Colors/example/bad-min
   Property: file://amf-client/shared/src/test/resources/validations/examples/min-max-items.raml#/declarations/types/array/Colors/example/bad-min

amf-client/shared/src/test/resources/validations/reports/examples/min-max-properties-example.report.js

@@ -6,7 +6,7 @@ Number of results: 2
 Level: Violation
 
 - Source: http://a.ml/vocabularies/amf/validation#example-validation-error
-  Message: should NOT have less than 2 properties
+  Message: should NOT have fewer than 2 properties
   Level: Violation
   Target: file://amf-client/shared/src/test/resources/validations/examples/min-max-properties-example.raml#/declarations/types/InvalidMax/example/badMin
   Property: file://amf-client/shared/src/test/resources/validations/examples/min-max-properties-example.raml#/declarations/types/InvalidMax/example/badMin

amf-client/shared/src/test/resources/validations/reports/model/raml/duplicated-property.report

@@ -0,0 +1,14 @@
+Model: file://amf-client/shared/src/test/resources/validations/duplicate-property/api.raml
+Profile: RAML 1.0
+Conforms? false
+Number of results: 1
+
+Level: Violation
+
+- Source: http://a.ml/vocabularies/amf/parser#NodeShape-properties-duplicatePropertyNames
+  Message: Duplicated property names: a, b
+  Level: Violation
+  Target: file://amf-client/shared/src/test/resources/validations/duplicate-property/api.raml#/declarations/types/test-duplicated-properties
+  Property: http://www.w3.org/ns/shacl#property
+  Position: Some(LexicalInformation([(8,6)-(9,0)]))
+  Location: file://amf-client/shared/src/test/resources/validations/duplicate-property/api.raml

amf-client/shared/src/test/resources/validations/valid-extension/api.raml

@@ -0,0 +1,14 @@
+#%RAML 1.0
+title: test API to be extended
+
+types:
+  TestObject:
+    type: object
+
+/test:
+  get:
+    responses:
+      200:
+        body:
+          application/json:
+            type: TestObject

amf-client/shared/src/test/resources/validations/valid-extension/extension.raml

@@ -0,0 +1,17 @@
+#%RAML 1.0 Extension
+extends: /api.raml
+
+types:
+  TestObject:
+    properties:
+      unionDate: datetime-only|nil
+    example:
+      unionDate: null
+
+/test:
+  get:
+    responses:
+      200:
+        body:
+          application/json:
+            type: TestObject

amf-client/shared/src/test/scala/amf/client/validation/ClientPayloadValidationTest.scala

@@ -5,11 +5,10 @@ import amf.client.convert.{NativeOps, WebApiRegister}
 import amf.client.model.DataTypes
 import amf.client.model.domain._
 import amf.core.AMF
-import amf.plugins.document.webapi.validation.PayloadValidatorPlugin
-import org.scalatest.{AsyncFunSuite, Matchers}
 import amf.core.model.domain.{RecursiveShape => InternalRecursiveShape}
-import amf.core.parser.{Annotations, Fields}
+import amf.plugins.document.webapi.validation.PayloadValidatorPlugin
 import amf.plugins.domain.shapes.models.{ScalarShape => InternalScalarShape}
+import org.scalatest.{AsyncFunSuite, Matchers}
 
 import scala.concurrent.ExecutionContext
 

amf-client/shared/src/test/scala/amf/resolution/EditingResolutionTest.scala

@@ -1,11 +1,9 @@
 package amf.resolution
 
-import amf.client.parse.DefaultParserErrorHandler
 import amf.core.emitter.RenderOptions
 import amf.core.model.document.BaseUnit
 import amf.core.parser.errorhandler.UnhandledParserErrorHandler
 import amf.core.remote.Syntax.Yaml
-import amf.core.remote.Vendor.{AMF, ASYNC20, OAS20, OAS30}
 import amf.core.remote._
 import amf.core.resolution.pipelines.ResolutionPipeline
 import amf.emit.AMFRenderer

amf-client/shared/src/test/scala/amf/resolution/ProductionValidationTest.scala

@@ -24,7 +24,11 @@ class ProductionValidationTest extends RamlResolutionTest {
   }
 
   multiGoldenTest("Recursive union raml to amf", "recursive-union.raml.%s") { config =>
-    cycle("recursive-union.raml", config.golden, RamlYamlHint, target = Amf, renderOptions = Some(config.renderOptions))
+    cycle("recursive-union.raml",
+          config.golden,
+          RamlYamlHint,
+          target = Amf,
+          renderOptions = Some(config.renderOptions))
   }
 
   test("Recursive union raml to raml") {
@@ -35,4 +39,7 @@ class ProductionValidationTest extends RamlResolutionTest {
     cycle("api.raml", "api.raml.raml", RamlYamlHint, Raml, directory = basePath + "patch-method/")
   }
 
+  test("Override enum in extension raml to raml") {
+    cycle("extension.raml", "result.raml", RamlYamlHint, Raml, directory = basePath + "override-enum/")
+  }
 }

amf-client/shared/src/test/scala/amf/resolution/ResolutionTest.scala

@@ -1,12 +1,9 @@
 package amf.resolution
 
-import amf.core.errorhandling.UnhandledErrorHandler
 import amf.core.model.document.BaseUnit
 import amf.core.remote._
 import amf.core.resolution.pipelines.ResolutionPipeline
-import amf.io.{FunSuiteCycleTests, MultiJsonldAsyncFunSuite}
-import amf.plugins.document.webapi.resolution.pipelines.{AmfEditingPipeline, AmfResolutionPipeline}
-import amf.plugins.document.webapi.{Async20Plugin, Oas20Plugin, Oas30Plugin, Raml08Plugin, Raml10Plugin}
+import amf.io.FunSuiteCycleTests
 
 abstract class ResolutionTest extends FunSuiteCycleTests with ResolutionCapabilities {
 

amf-client/shared/src/test/scala/amf/validation/RamlBodyPayloadValidationTest.scala

@@ -4,7 +4,6 @@ import amf.client.parse.DefaultParserErrorHandler
 import amf.client.plugins.{StrictValidationMode, ValidationMode}
 import amf.core.model.document.{BaseUnit, Document}
 import amf.core.model.domain.Shape
-import amf.core.parser.errorhandler.UnhandledParserErrorHandler
 import amf.core.remote._
 import amf.core.unsafe.PlatformSecrets
 import amf.core.validation.{AMFValidationReport, SeverityLevels}

amf-client/shared/src/test/scala/amf/validation/RamlModelUniquePlatformReportTest.scala

@@ -591,4 +591,15 @@ class RamlModelUniquePlatformReportTest extends UniquePlatformReportGenTest {
              Raml10Profile)
   }
 
+  test("RAML union type with nil when applying extension") {
+    validate("valid-extension/extension.raml")
+  }
+
+  test("multiple uses objects pointing to the same library file") {
+    validate("multiple-uses/multiple-uses.raml")
+  }
+
+  test("invalid duplicated nullable property") {
+    validate("duplicate-property/api.raml", Some("raml/duplicated-property.report"))
+  }
 }

amf-webapi.versions

@@ -1,4 +1,4 @@
-amf.webapi=4.7.5
-amf.core=4.2.221
-amf.custom.validations=5.1.7
+amf.webapi=4.7.6
+amf.core=4.2.223
+amf.custom.validations=5.1.8
 amf.model=3.1.0

amf-webapi/jvm/src/main/scala/amf/plugins/document/webapi/validation/remote/JvmPayloadValidator.scala

@@ -18,25 +18,14 @@ import amf.validations.PayloadValidations.{
   ExampleValidationErrorSpecification,
   SchemaException => InternalSchemaException
 }
-import org.everit.json.schema.internal.{
-  DateFormatValidator,
-  DateTimeFormatValidator,
-  EmailFormatValidator,
-  HostnameFormatValidator,
-  IPV4Validator,
-  IPV6Validator,
-  RegexFormatValidator,
-  URIFormatValidator,
-  URIV4FormatValidator
-}
+import org.everit.json.schema.internal._
 import org.everit.json.schema.loader.SchemaLoader
 import org.everit.json.schema.regexp.{JavaUtilRegexpFactory, Regexp}
 import org.everit.json.schema.{Schema, SchemaException, ValidationException, Validator}
 import org.json.JSONException
 
 import java.util.regex.PatternSyntaxException
 import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable`
-import scala.collection.mutable.ArrayBuffer
 
 class JvmPayloadValidator(val shape: Shape, val validationMode: ValidationMode, val env: Environment)
     extends PlatformPayloadValidator(shape, env) {
@@ -60,7 +49,7 @@ class JvmPayloadValidator(val shape: Shape, val validationMode: ValidationMode,
     } catch {
       case validationException: ValidationException =>
         validationProcessor.processException(validationException, fragment.map(_.encodes))
-      case exception: Error =>
+      case exception: Throwable =>
         validationProcessor.processException(exception, fragment.map(_.encodes))
     }
   }
@@ -175,6 +164,9 @@ case class JvmReportValidationProcessor(override val profileName: ProfileName,
       case e: InvalidJsonValue =>
         Seq(invalidJsonValidation("Invalid json value was provided", element, e))
 
+      case e: ArithmeticException if e.getMessage == "Division undefined" || e.getMessage == "Division by zero" =>
+        Seq(invalidJsonValidation("Can't divide by 0", element, e))
+
       case other =>
         super.processCommonException(other, element)
     }

amf-webapi/shared/src/main/scala/amf/plugins/document/webapi/RamlPlugin.scala

@@ -1,9 +1,10 @@
 package amf.plugins.document.webapi
 
 import amf._
-import amf.core.client.ParsingOptions
 import amf.client.remod.amfcore.config.RenderOptions
 import amf.client.remod.amfcore.plugins.parse.AMFParsePluginAdapter
+import amf.core.Root
+import amf.core.client.ParsingOptions
 import amf.core.errorhandling.ErrorHandler
 import amf.core.exception.InvalidDocumentHeaderException
 import amf.core.model.document._
@@ -15,13 +16,11 @@ import amf.core.parser.{
   ParsedReference,
   ParserContext,
   RefContainer,
-  ReferenceKind,
   UnspecifiedReference
 }
 import amf.core.remote.{Platform, Raml, Vendor}
 import amf.core.resolution.pipelines.ResolutionPipeline
 import amf.core.validation.core.ValidationProfile
-import amf.core.{CompilerContext, Root}
 import amf.plugins.document.webapi.contexts.emitter.raml.{
   Raml08SpecEmitterContext,
   Raml10SpecEmitterContext,
@@ -108,7 +107,7 @@ sealed trait RamlPlugin extends BaseWebApiPlugin with CrossSpecRestriction {
   private def validateReferencesToLibraries(reference: ParsedReference, ctx: ParserContext): Unit = {
     val refs: Seq[RefContainer] = reference.origin.refs
     val allKinds                = refs.map(_.linkType)
-    val definedKind             = if (allKinds.size > 1) UnspecifiedReference else allKinds.head
+    val definedKind             = if (allKinds.distinct.size > 1) UnspecifiedReference else allKinds.head
     val nodes                   = refs.map(_.node)
     reference.unit match {
       case _: Module => // if is a library, kind should be LibraryReference