Update schemas to match the Paris edition of the protocol (#134)

This effectively means stepping up ArtP and CD to v3.1.0, but only the former actually affects the schemas. Regenerating the files deletes the copyright header in each file, but the header was retained.
eiffel-community · Aug 11, 2021 · 70a1ec6 · 70a1ec6
1 parent 9dbec23
commit 70a1ec6
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.2.0
+- Updated schemas to match the Paris edition of the protocol.
+
 ## 2.1.1
 - Uplifted eiffel-remrem-parent version from 2.0.4 to 2.0.5.
 - Uplifted eiffel-remrem-protocol-interface version from 2.1.0 to 2.1.1.

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
         <version>2.0.5</version>
     </parent>
     <artifactId>eiffel-remrem-semantics</artifactId>
-    <version>2.1.1</version>
+    <version>2.2.0</version>
     <packaging>jar</packaging>
     <properties>
         <eclipse.jgit.version>5.0.1.201806211838-r</eclipse.jgit.version>
@@ -116,7 +116,7 @@
                             <mainClass>com.ericsson.eiffel.remrem.semantics.clone.PrepareLocalEiffelSchemas</mainClass>
                             <arguments>
                                 <argument>https://github.com/eiffel-community/eiffel.git</argument>
-                                <argument>tags/edition-agen-1</argument>
+                                <argument>tags/edition-paris</argument>
                                 <argument>https://github.com/Ericsson/eiffel-operations-extension.git</argument>
                                 <argument>tags/edition-agen</argument>
                             </arguments>

diff --git a/src/main/java/com/ericsson/eiffel/semantics/events/EiffelArtifactPublishedEventMeta.java b/src/main/java/com/ericsson/eiffel/semantics/events/EiffelArtifactPublishedEventMeta.java
@@ -47,7 +47,7 @@ public class EiffelArtifactPublishedEventMeta implements Meta
      */
     @SerializedName("version")
     @Expose
-    private EiffelArtifactPublishedEventMeta.Version version = EiffelArtifactPublishedEventMeta.Version.fromValue("3.0.0");
+    private EiffelArtifactPublishedEventMeta.Version version = EiffelArtifactPublishedEventMeta.Version.fromValue("3.1.0");
     /**
      * 
      * (Required)
@@ -201,8 +201,8 @@ public static EiffelArtifactPublishedEventMeta.Type fromValue(String value) {
 
     public enum Version {
 
-        @SerializedName("3.0.0")
-        _3_0_0("3.0.0");
+        @SerializedName("3.1.0")
+        _3_1_0("3.1.0");
         private final String value;
         private final static Map<String, EiffelArtifactPublishedEventMeta.Version> CONSTANTS = new HashMap<String, EiffelArtifactPublishedEventMeta.Version>();
 

diff --git a/src/main/java/com/ericsson/eiffel/semantics/events/EiffelCompositionDefinedEventMeta.java b/src/main/java/com/ericsson/eiffel/semantics/events/EiffelCompositionDefinedEventMeta.java
@@ -47,7 +47,7 @@ public class EiffelCompositionDefinedEventMeta implements Meta
      */
     @SerializedName("version")
     @Expose
-    private EiffelCompositionDefinedEventMeta.Version version = EiffelCompositionDefinedEventMeta.Version.fromValue("3.0.0");
+    private EiffelCompositionDefinedEventMeta.Version version = EiffelCompositionDefinedEventMeta.Version.fromValue("3.1.0");
     /**
      * 
      * (Required)
@@ -201,8 +201,8 @@ public static EiffelCompositionDefinedEventMeta.Type fromValue(String value) {
 
     public enum Version {
 
-        @SerializedName("3.0.0")
-        _3_0_0("3.0.0");
+        @SerializedName("3.1.0")
+        _3_1_0("3.1.0");
         private final String value;
         private final static Map<String, EiffelCompositionDefinedEventMeta.Version> CONSTANTS = new HashMap<String, EiffelCompositionDefinedEventMeta.Version>();
 

diff --git a/src/main/java/com/ericsson/eiffel/semantics/events/Location.java b/src/main/java/com/ericsson/eiffel/semantics/events/Location.java
@@ -21,6 +21,9 @@
 
 public class Location {
 
+    @SerializedName("name")
+    @Expose
+    private String name;
     /**
      * 
      * (Required)
@@ -38,6 +41,14 @@ public class Location {
     @Expose
     private String uri;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     /**
      * 
      * (Required)

diff --git a/src/main/resources/schemas/input/EiffelArtifactPublishedEvent.json b/src/main/resources/schemas/input/EiffelArtifactPublishedEvent.json
@@ -24,9 +24,9 @@
         "version": {
           "type": "string",
           "enum": [
-            "3.0.0"
+            "3.1.0"
           ],
-          "default": "3.0.0"
+          "default": "3.1.0"
         },
         "time": {
           "type": "integer",
@@ -147,6 +147,9 @@
             "type": "object",
             "javaType": "com.ericsson.eiffel.semantics.events.Location",
             "properties": {
+              "name": {
+                "type": "string"
+              },
               "type": {
                 "type": "string",
                 "enum": [

diff --git a/src/main/resources/schemas/input/EiffelCompositionDefinedEvent.json b/src/main/resources/schemas/input/EiffelCompositionDefinedEvent.json
@@ -24,9 +24,9 @@
         "version": {
           "type": "string",
           "enum": [
-            "3.0.0"
+            "3.1.0"
           ],
-          "default": "3.0.0"
+          "default": "3.1.0"
         },
         "time": {
           "type": "integer",

diff --git a/src/test/resources/input/ArtifactPublished.json b/src/test/resources/input/ArtifactPublished.json
@@ -2,7 +2,7 @@
   "msgParams": {
     "meta": {
       "type": "EiffelArtifactPublishedEvent",
-      "version": "3.0.0",
+      "version": "3.1.0",
       "tags": [
         "tag1",
         "tag2"
@@ -24,6 +24,7 @@
     "data": {
       "locations": [{
           "type": "ARTIFACTORY",
+          "name": "file1",
           "uri": "https:\/\/one.place"
         },
         {

diff --git a/src/test/resources/input/CompositionDefined.json b/src/test/resources/input/CompositionDefined.json
@@ -2,7 +2,7 @@
   "msgParams": {
     "meta": {
       "type": "EiffelCompositionDefinedEvent",
-      "version": "3.0.0",
+      "version": "3.1.0",
       "tags": [
         "tag1",
         "tag2"

diff --git a/src/test/resources/output/ArtifactPublished.json b/src/test/resources/output/ArtifactPublished.json
@@ -2,7 +2,7 @@
   "meta": {
     "id": "ff2f8aae-692d-4906-a3a3-bd819d4769c3",
     "type": "EiffelArtifactPublishedEvent",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "time": 1554389528061,
     "tags": [
       "tag1",
@@ -26,6 +26,7 @@
     "locations": [
       {
         "type": "ARTIFACTORY",
+        "name": "file1",
         "uri": "https://one.place"
       },
       {

diff --git a/src/test/resources/output/CompositionDefined.json b/src/test/resources/output/CompositionDefined.json
@@ -2,7 +2,7 @@
   "meta": {
     "id": "9019c5d4-4647-479e-bb5e-0a0c597c115e",
     "type": "EiffelCompositionDefinedEvent",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "time": 1554389919067,
     "tags": [
       "tag1",