Merge pull request #919 from aml-org/r/v5.3.8

W-13122900: r/v5.3.8
aml-org · May 10, 2023 · 6f08028 · 6f08028
2 parents 0ecb20e + 0bb6669
commit 6f08028
Show file tree

Hide file tree

Showing 35 changed files with 156 additions and 105 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM ubuntu:18.04
+FROM eclipse-temurin:17-focal
 
 # hadolint ignore=DL3002
 USER root
 
 ARG USER_HOME_DIR="/root"
 
 ENV SCALA_VERSION 2.12.13
-ENV SBT_VERSION 1.6.0
+ENV SBT_VERSION 1.7.1
 
 
 # Update the repository sources list and install dependencies
@@ -15,12 +15,14 @@ RUN apt-get update
 RUN apt-get install -y software-properties-common unzip htop rsync openssh-client jq git
 
 # install Java
+RUN java -version
+
 RUN mkdir -p /usr/share/man/man1 && \
-    apt-get update -y && \
-    apt-get install -y openjdk-8-jdk
+    apt-get update -y
 
 RUN apt-get install unzip -y && \
-    apt-get autoremove -y
+    apt-get autoremove -y && \
+    apt-get install git -y
 
 # Install Scala
 ## Piping curl directly in tar
@@ -35,7 +37,7 @@ RUN \
   curl -L -o sbt-$SBT_VERSION.deb https://scala.jfrog.io/artifactory/debian/sbt-$SBT_VERSION.deb && \
   dpkg -i sbt-$SBT_VERSION.deb && \
   rm sbt-$SBT_VERSION.deb && \
-  sbt -Dsbt.rootdir=true sbtVersion
+  sbt -Dsbt.rootdir=true -Djava.io.tmpdir=$HOME sbtVersion
 
 VOLUME "$USER_HOME_DIR/.sbt"
 

diff --git a/als-actions/js/package-lock.json b/als-actions/js/package-lock.json
diff --git a/als-actions/js/package.json b/als-actions/js/package.json
@@ -6,7 +6,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.6.22",
+    "@aml-org/amf-antlr-parsers": "0.6.23",
     "ajv": "6.12.6"
   },
   "author": "",

diff --git a/als-actions/shared/src/test/resources/codeactions/conversions/declared-type.raml.golden.yaml b/als-actions/shared/src/test/resources/codeactions/conversions/declared-type.raml.golden.yaml
@@ -30,7 +30,6 @@ documentChanges:
               "example": {
                 "prop": "this is an example"
               },
-              "additionalProperties": true,
               "required": [
                 "prop"
               ],

diff --git a/...tions/shared/src/test/resources/codeactions/conversions/external-example.raml.golden.yaml b/...tions/shared/src/test/resources/codeactions/conversions/external-example.raml.golden.yaml
@@ -30,7 +30,6 @@ documentChanges:
                 "$ref": "aux/example.json"
               },
               "type": "object",
-              "additionalProperties": true,
               "required": [
                 "aString",
                 "myObject"
@@ -49,7 +48,6 @@ documentChanges:
               "example": {
                 "prop": "this is an example"
               },
-              "additionalProperties": true,
               "required": [
                 "prop"
               ],

diff --git a/...ions/shared/src/test/resources/codeactions/conversions/external-in-props.raml.golden.yaml b/...ions/shared/src/test/resources/codeactions/conversions/external-in-props.raml.golden.yaml
@@ -27,7 +27,6 @@ documentChanges:
           "definitions": {
             "schema": {
               "type": "object",
-              "additionalProperties": true,
               "required": [
                 "numberHolder"
               ],
@@ -38,24 +37,20 @@ documentChanges:
                     "max": 9,
                     "min": "test"
                   },
-                  "additionalProperties": true,
                   "required": [
                     "min",
                     "max"
                   ],
                   "properties": {
                     "min": {
-                      "$ref": "#/definitions/schema_1"
+                      "type": "string"
                     },
                     "max": {
                       "type": "number"
                     }
                   }
                 }
               }
-            },
-            "schema_1": {
-              "type": "string"
             }
           }
         }
diff --git a/...test/resources/codeactions/conversions/inlined-json-schema-to-raml-range.raml.golden.yaml b/...test/resources/codeactions/conversions/inlined-json-schema-to-raml-range.raml.golden.yaml
@@ -11,8 +11,6 @@ documentChanges:
         +
 
             displayName: Person
-            type: object
-            additionalProperties: true
             properties:
               firstName:
                 type: string

diff --git a/...rces/codeactions/conversions/inlined-json-schema-to-raml-type-at-payload.raml.golden.yaml b/...rces/codeactions/conversions/inlined-json-schema-to-raml-type-at-payload.raml.golden.yaml
@@ -11,19 +11,13 @@ documentChanges:
         +
 
                     description: A representation of a person, company, organization, or place
-                    type: object
-                    additionalProperties: true
                     properties:
                       fruits:
-                        type: array
                         items:
                           type: string
                         required: false
                       vegetables:
-                        type: array
                         items:
-                          type: object
-                          additionalProperties: true
                           properties:
                             veggieName:
                               type: string

diff --git a/...codeactions/conversions/inlined-json-schema-to-raml-type-from-properties.raml.golden.yaml b/...codeactions/conversions/inlined-json-schema-to-raml-type-from-properties.raml.golden.yaml
@@ -11,8 +11,6 @@ documentChanges:
         +
 
             displayName: Person
-            type: object
-            additionalProperties: true
             properties:
               firstName:
                 type: string

diff --git a/.../test/resources/codeactions/conversions/inlined-json-schema-to-raml-type.raml.golden.yaml b/.../test/resources/codeactions/conversions/inlined-json-schema-to-raml-type.raml.golden.yaml
@@ -11,8 +11,6 @@ documentChanges:
         +
 
             displayName: Person
-            type: object
-            additionalProperties: true
             properties:
               firstName:
                 type: string

diff --git a/...actions/shared/src/test/resources/codeactions/conversions/inlined-result.raml.golden.yaml b/...actions/shared/src/test/resources/codeactions/conversions/inlined-result.raml.golden.yaml
@@ -27,14 +27,12 @@ documentChanges:
           "definitions": {
             "schema": {
               "type": "object",
-              "additionalProperties": true,
               "required": [
                 "numberHolder"
               ],
               "properties": {
                 "numberHolder": {
                   "type": "object",
-                  "additionalProperties": true,
                   "required": [
                     "min",
                     "max"

diff --git a/...ed/src/test/resources/codeactions/conversions/resolve-internal-reference.raml.golden.yaml b/...ed/src/test/resources/codeactions/conversions/resolve-internal-reference.raml.golden.yaml
@@ -28,7 +28,6 @@ documentChanges:
             "Board": {
               "description": "board of directors",
               "type": "object",
-              "additionalProperties": true,
               "required": [
                 "members"
               ],
@@ -44,7 +43,6 @@ documentChanges:
             "Person": {
               "description": "my schema",
               "type": "object",
-              "additionalProperties": true,
               "required": [
                 "name",
                 "age"

diff --git a/...shared/src/test/resources/codeactions/conversions/type-with-inlined-json.raml.golden.yaml b/...shared/src/test/resources/codeactions/conversions/type-with-inlined-json.raml.golden.yaml
@@ -28,7 +28,6 @@ documentChanges:
             "A": {
               "description": "inlined json schema",
               "type": "object",
-              "additionalProperties": true,
               "properties": {
                 "input": {
                   "type": "string"

diff --git a/als-common/js/package-lock.json b/als-common/js/package-lock.json
diff --git a/als-common/js/package.json b/als-common/js/package.json
@@ -6,7 +6,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.6.22",
+    "@aml-org/amf-antlr-parsers": "0.6.23",
     "ajv": "6.12.6"
   },
   "author": "",

diff --git a/als-node-client/node-package/package-lock.json b/als-node-client/node-package/package-lock.json
diff --git a/als-node-client/node-package/package.json b/als-node-client/node-package/package.json
@@ -15,7 +15,7 @@
     "als": "./dist/als-node-client.min.js"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.6.22",
+    "@aml-org/amf-antlr-parsers": "0.6.23",
     "@aml-org/amf-custom-validator": "1.4.0",
     "@aml-org/amf-custom-validator-web": "1.4.0",
     "ajv": "6.12.6",

diff --git a/als-server/js/node-package/package-lock.json b/als-server/js/node-package/package-lock.json
diff --git a/als-server/js/node-package/package.json b/als-server/js/node-package/package.json
@@ -15,7 +15,7 @@
     "build:dist": "webpack --config ./webpack.config.js"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.6.22",
+    "@aml-org/amf-antlr-parsers": "0.6.23",
     "@aml-org/amf-custom-validator": "1.4.0",
     "@aml-org/amf-custom-validator-web": "1.4.0",
     "ajv": "6.12.6",

diff --git a/...server/jvm/src/main/scala/org/mulesoft/als/server/client/AlsLanguageClientExtensions.java b/...server/jvm/src/main/scala/org/mulesoft/als/server/client/AlsLanguageClientExtensions.java
@@ -0,0 +1,24 @@
+package org.mulesoft.als.server.client;
+
+import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.services.LanguageClientExtensions;
+import org.mulesoft.als.server.feature.serialization.SerializationResult;
+import org.mulesoft.als.server.feature.workspace.FilesInProjectParams;
+
+import java.io.StringWriter;
+
+public interface AlsLanguageClientExtensions extends LanguageClientExtensions {
+    /**
+     * Serialization notifications are sent from the server to the client to
+     * signal results of serialization runs.
+     */
+    @JsonNotification("serializeJSONLD")
+    void publishSerialization(SerializationResult<StringWriter> serialization);
+
+    /**
+     * filesInProject notifications are sent from the server to the client to
+     * signal results of main file runs.
+     */
+    @JsonNotification("filesInProject")
+    void publishProjectFiles(FilesInProjectParams filesInProjectParams);
+}
diff --git a/als-server/jvm/src/main/scala/org/mulesoft/als/server/client/AlsLanguageClientWrapper.scala b/als-server/jvm/src/main/scala/org/mulesoft/als/server/client/AlsLanguageClientWrapper.scala
@@ -0,0 +1,25 @@
+package org.mulesoft.als.server.client
+
+import org.mulesoft.als.server.feature.serialization.SerializationResult
+import org.mulesoft.als.server.feature.workspace.FilesInProjectParams
+import org.mulesoft.als.server.protocol.client.AlsLanguageClient
+import org.mulesoft.lsp.Lsp4JConversions.lsp4JPublishDiagnosticsParams
+import org.mulesoft.lsp.client.LspLanguageClient
+import org.mulesoft.lsp.feature.diagnostic.PublishDiagnosticsParams
+import org.mulesoft.lsp.feature.telemetry.TelemetryMessage
+
+import java.io.StringWriter
+
+case class AlsLanguageClientWrapper(private val inner: AlsLanguageClientExtensions)
+    extends LspLanguageClient
+    with AlsLanguageClient[StringWriter] {
+  override def publishDiagnostic(params: PublishDiagnosticsParams): Unit =
+    inner.publishDiagnostics(params)
+
+  override def notifyTelemetry(params: TelemetryMessage): Unit =
+    inner.telemetryEvent(params)
+
+  override def notifySerialization(params: SerializationResult[StringWriter]): Unit = inner.publishSerialization(params)
+
+  override def notifyProjectFiles(params: FilesInProjectParams): Unit = inner.publishProjectFiles(params)
+}