chore: 1.0.0-eap-1 master

asyncapi-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>asyncapi</artifactId>
         <groupId>com.asyncapi</groupId>
-        <version>1.0.0-EAP</version>
+        <version>1.0.0-EAP-1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

asyncapi-core/src/main/java/com/asyncapi/v2/model/channel/message/Message.java

@@ -135,7 +135,10 @@ public class Message {
     private Map<String, ? extends MessageBinding> bindings;
 
     /**
-     * An array with examples of valid message objects.
+     * An array of key/value pairs where keys MUST be either <b></b>headers</b> and/or <b>payload</b>.
+     * <br>
+     * Values MUST contain examples
+     * that validate against the {@link #headers} or {@link #payload} fields, respectively.
      */
     @CheckForNull
     private List<Map<String, Object>> examples;

asyncapi-core/src/main/java/com/asyncapi/v2/model/schema/Type.java

@@ -1,25 +1,16 @@
 package com.asyncapi.v2.model.schema;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * @author Pavel Bodiachevskii
  */
-public enum  Type {
+public class Type {
 
-    @JsonProperty("null")
-    NULL,
-    @JsonProperty("boolean")
-    BOOLEAN,
-    @JsonProperty("object")
-    OBJECT,
-    @JsonProperty("array")
-    ARRAY,
-    @JsonProperty("number")
-    NUMBER,
-    @JsonProperty("string")
-    STRING,
-    @JsonProperty("integer")
-    INTEGER
+    public final static String NULL = "null";
+    public final static String BOOLEAN = "boolean";
+    public final static String OBJECT = "object";
+    public final static String ARRAY = "array";
+    public final static String NUMBER = "number";
+    public final static String STRING = "string";
+    public final static String INTEGER = "integer";
 
 }

asyncapi-plugin/asyncapi-plugin-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>asyncapi-plugin</artifactId>
         <groupId>com.asyncapi</groupId>
-        <version>1.0.0-EAP</version>
+        <version>1.0.0-EAP-1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.asyncapi</groupId>
             <artifactId>asyncapi-core</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0-EAP-1</version>
         </dependency>
     </dependencies>
 

asyncapi-plugin/asyncapi-plugin-gradle/README.md

@@ -75,7 +75,7 @@ class Lamps(asyncapi: String = "2.0.0",
                                 Pair("port", ServerVariable.builder()
                                         .description("Secure connection (TLS) is available through port 8883.")
                                         .defaultValue("1883")
-                                        .enumValues(listOf("1883", "8883"))
+                                        .enumValue(listOf("1883", "8883"))
                                         .build()
                                 )
                         ))

asyncapi-plugin/asyncapi-plugin-gradle/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 }
 
 group = "com.asyncapi"
-version = "1.0.0-EAP"
+version = "1.0.0-EAP-1"
 
 dependencies {
     val reflectionsVersion = "0.9.12"
@@ -27,7 +27,7 @@ dependencies {
     compile("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
     compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
 
-    compile("com.asyncapi:asyncapi-plugin-core:1.0.0-SNAPSHOT")
+    compile("com.asyncapi:asyncapi-plugin-core:1.0.0-EAP-1")
 
     testCompile("org.jetbrains.kotlin:kotlin-test:1.3.71")
     testCompile("org.junit.jupiter:junit-jupiter-engine:5.6.1")

asyncapi-plugin/asyncapi-plugin-gradle/src/test/resources/build.gradle

@@ -16,6 +16,6 @@ sourceSets {
 }
 
 dependencies {
-    compile "com.asyncapi:asyncapi-core:1.0.0-EAP"
+    compile "com.asyncapi:asyncapi-core:1.0.0-EAP-1"
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }

asyncapi-plugin/asyncapi-plugin-gradle/src/test/resources/lamps-asyncapi.json

@@ -1 +1 @@
-{"asyncapi":"2.0.0","defaultContentType":"application/json","info":{"title":"Lamps API","version":"1.0.0","description":"Recive real-time information about lamps","license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0"}},"servers":{"production":{"url":"api.streetlights.smartylighting.com:{port}","protocol":"mqtt","description":"Test broker","variables":{"port":{"description":"Secure connection (TLS) is available through port 8883.","enum":["1883","8883"],"default":"1883"}},"security":[{"apiKey":[]},{"supportedOauthFlows":["streetlights:on","streetlights:off","streetlights:dim"]},{"openIdConnectWellKnown":[]}]}},"channels":{"smartylighting/lamps/1/0/event/{lampId}/info":{"description":"The topic on which lamp info may be produced and consumed.","subscribe":{"operationId":"receiveLampInfo","summary":"Receive information about lamp.","traits":[{"$ref":"#/components/operationTraits/kafka"}],"message":{"$ref":"#/components/messages/lampInfo"}},"parameters":{"lampId":{"$ref":"#/components/parameters/lampId"}}}},"components":{"schemas":{"lampInfoPayload":{"type":"object","properties":{"lumens":{"type":"integer","minimum":0,"description":"Lamp intensity measured in lumens."},"watts":{"type":"integer","maximum":100,"minimum":0,"description":"Lamp watt consumption."}}}},"messages":{"lampInfo":{"payload":{"$ref":"#/components/schemas/lampInfoPayload"},"contentType":"application/json","name":"lampInfo","title":"Lamp info","summary":"Lamp information.","traits":[{"$ref":"#/components/messageTraits/commonHeaders"}]}},"securitySchemes":{"apiKey":{"type":"apiKey","description":"Provide your API key as the user and leave the password empty.","in":"user"}},"parameters":{"lampId":{"description":"The ID of the lamp.","schema":{"type":"string"}}},"operationTraits":{"kafka":{"bindings":{"kafka":{"clientId":"my-app-id"}}}},"messageTraits":{"commonHeaders":{"headers":{"type":"object","properties":{"my-app-header":{"type":"integer","maximum":100,"minimum":0}}}}}}}
+{"asyncapi":"2.0.0","defaultContentType":"application/json","info":{"title":"Lamps API","version":"1.0.0","description":"Recive real-time information about lamps","license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0"}},"servers":{"production":{"url":"api.streetlights.smartylighting.com:{port}","protocol":"mqtt","description":"Test broker","variables":{"port":{"description":"Secure connection (TLS) is available through port 8883.","enum":["1883","8883"],"default":"1883"}},"security":[{"apiKey":[]},{"supportedOauthFlows":["streetlights:on","streetlights:off","streetlights:dim"]},{"openIdConnectWellKnown":[]}]}},"channels":{"smartylighting/lamps/1/0/event/{lampId}/info":{"description":"The topic on which lamp info may be produced and consumed.","subscribe":{"operationId":"receiveLampInfo","summary":"Receive information about lamp.","traits":[{"$ref":"#/components/operationTraits/kafka"}],"message":{"$ref":"#/components/messages/lampInfo"}},"parameters":{"lampId":{"$ref":"#/components/parameters/lampId"}}}},"components":{"schemas":{"lampInfoPayload":{"type":"object","properties":{"lumens":{"description":"Lamp intensity measured in lumens.","type":"integer","minimum":0},"watts":{"description":"Lamp watt consumption.","type":"integer","maximum":100,"minimum":0}}}},"messages":{"lampInfo":{"payload":{"$ref":"#/components/schemas/lampInfoPayload"},"contentType":"application/json","name":"lampInfo","title":"Lamp info","summary":"Lamp information.","traits":[{"$ref":"#/components/messageTraits/commonHeaders"}]}},"securitySchemes":{"apiKey":{"type":"apiKey","description":"Provide your API key as the user and leave the password empty.","in":"user"}},"parameters":{"lampId":{"description":"The ID of the lamp.","schema":{"type":"string"}}},"operationTraits":{"kafka":{"bindings":{"kafka":{"clientId":"my-app-id"}}}},"messageTraits":{"commonHeaders":{"headers":{"type":"object","properties":{"my-app-header":{"type":"integer","maximum":100,"minimum":0}}}}}}}

asyncapi-plugin/asyncapi-plugin-gradle/src/test/resources/lamps-asyncapi.yaml

@@ -45,14 +45,14 @@ components:
       type: "object"
       properties:
         lumens:
+          description: "Lamp intensity measured in lumens."
           type: "integer"
           minimum: 0
-          description: "Lamp intensity measured in lumens."
         watts:
+          description: "Lamp watt consumption."
           type: "integer"
           maximum: 100
           minimum: 0
-          description: "Lamp watt consumption."
   messages:
     lampInfo:
       payload:

asyncapi-plugin/asyncapi-plugin-gradle/src/test/resources/lamps_prettyPrint-asyncapi.json

@@ -57,15 +57,15 @@
         "type" : "object",
         "properties" : {
           "lumens" : {
+            "description" : "Lamp intensity measured in lumens.",
             "type" : "integer",
-            "minimum" : 0,
-            "description" : "Lamp intensity measured in lumens."
+            "minimum" : 0
           },
           "watts" : {
+            "description" : "Lamp watt consumption.",
             "type" : "integer",
             "maximum" : 100,
-            "minimum" : 0,
-            "description" : "Lamp watt consumption."
+            "minimum" : 0
           }
         }
       }

asyncapi-plugin/asyncapi-plugin-maven/README.md

@@ -74,7 +74,7 @@ public class StreetlightsAsyncAPI extends AsyncAPI {
         serverVariables.put("port", ServerVariable.builder()
                 .description("Secure connection (TLS) is available through port 8883.")
                 .defaultValue("1883")
-                .enumValues(Arrays.asList("1883", "8883"))
+                .enumValue(Arrays.asList("1883", "8883"))
                 .build()
         );
 

asyncapi-plugin/asyncapi-plugin-maven/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>asyncapi-plugin</artifactId>
         <groupId>com.asyncapi</groupId>
-        <version>1.0.0-EAP</version>
+        <version>1.0.0-EAP-1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.asyncapi</groupId>
             <artifactId>asyncapi-plugin-core</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0-EAP-1</version>
         </dependency>
     </dependencies>
 

asyncapi-plugin/asyncapi-plugin-maven/src/test/java/com/asyncapi/plugin/maven/JsonSchemaGeneratorMojoTest.java

@@ -15,6 +15,9 @@
 
 import java.io.File;
 import java.io.FileReader;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author Pavel Bodiachevskii
@@ -51,7 +54,7 @@ public Object[] singleSchemaGenerationParams() {
     public void singleSchemaGenerationTest(File pom, File generatedSchema, File expectedSchema) throws Exception {
         executePom(pom);
 
-        Assert.assertEquals(FileUtils.readLines(expectedSchema), FileUtils.readLines(generatedSchema));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchema)), format(FileUtils.readLines(generatedSchema)));
     }
 
     public Object[] multipleSchemaGenerationParams() {
@@ -92,8 +95,8 @@ public void multipleSchemasGenerationTest(File pom,
     ) throws Exception {
         executePom(pom);
 
-        Assert.assertEquals(FileUtils.readLines(expectedSchemaFirst), FileUtils.readLines(generatedSchemaFirst));
-        Assert.assertEquals(FileUtils.readLines(expectedSchemaSecond), FileUtils.readLines(generatedSchemaSecond));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchemaFirst)), format(FileUtils.readLines(generatedSchemaFirst)));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchemaSecond)), format(FileUtils.readLines(generatedSchemaSecond)));
     }
 
     @Test
@@ -103,7 +106,7 @@ public void customFileNameGenerationTest() throws Exception {
         File generatedSchema = FilesHelper.open("target/generated-test-sources/Complete/StreetlightsAsyncAPI-asyncapi-schema.json");
         File expectedSchema = FilesHelper.readResource("reference-test-cases/json/StreetlightsAsyncAPI-asyncapi.json");
 
-        Assert.assertEquals(FileUtils.readLines(expectedSchema), FileUtils.readLines(generatedSchema));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchema)), format(FileUtils.readLines(generatedSchema)));
     }
 
     /**
@@ -125,4 +128,20 @@ private void executePom(File pomFile) throws Exception {
         myMojo.execute();
     }
 
+    private List<String> format(List<String> fileLines) {
+        return fileLines.stream()
+                .filter(Objects::nonNull)
+                .filter(line -> !line.isEmpty())
+                .map(line -> {
+                    int index = line.lastIndexOf(",");
+                    if (index > 0) {
+                        return line.substring(0, index);
+                    }
+
+                    return line;
+                })
+                .sorted()
+                .collect(Collectors.toList());
+    }
+
 }

asyncapi-plugin/asyncapi-plugin-maven/src/test/java/com/asyncapi/plugin/maven/YamlSchemaGeneratorMojoTest.java

@@ -15,6 +15,9 @@
 
 import java.io.File;
 import java.io.FileReader;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author Pavel Bodiachevskii
@@ -51,7 +54,7 @@ public Object[] singleSchemaGenerationParams() {
     public void singleSchemaGenerationTest(File pom, File generatedSchema, File expectedSchema) throws Exception {
         executePom(pom);
 
-        Assert.assertEquals(FileUtils.readLines(expectedSchema), FileUtils.readLines(generatedSchema));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchema)), format(FileUtils.readLines(generatedSchema)));
     }
 
     public Object[] multipleSchemaGenerationParams() {
@@ -92,8 +95,8 @@ public void multipleSchemasGenerationTest(File pom,
     ) throws Exception {
         executePom(pom);
 
-        Assert.assertEquals(FileUtils.readLines(expectedSchemaFirst), FileUtils.readLines(generatedSchemaFirst));
-        Assert.assertEquals(FileUtils.readLines(expectedSchemaSecond), FileUtils.readLines(generatedSchemaSecond));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchemaFirst)), format(FileUtils.readLines(generatedSchemaFirst)));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchemaSecond)), format(FileUtils.readLines(generatedSchemaSecond)));
     }
 
     @Test
@@ -103,7 +106,7 @@ public void customFileNameGenerationTest() throws Exception {
         File generatedSchema = FilesHelper.open("target/generated-test-sources/Complete/StreetlightsAsyncAPI-asyncapi-schema.yaml");
         File expectedSchema = FilesHelper.readResource("reference-test-cases/yaml/StreetlightsAsyncAPI-asyncapi.yaml");
 
-        Assert.assertEquals(FileUtils.readLines(expectedSchema), FileUtils.readLines(generatedSchema));
+        Assert.assertEquals(format(FileUtils.readLines(expectedSchema)), format(FileUtils.readLines(generatedSchema)));
     }
 
     /**
@@ -125,4 +128,20 @@ private void executePom(File pomFile) throws Exception {
         myMojo.execute();
     }
 
+    private List<String> format(List<String> fileLines) {
+        return fileLines.stream()
+                .filter(Objects::nonNull)
+                .filter(line -> !line.isEmpty())
+                .map(line -> {
+                    int index = line.lastIndexOf(",");
+                    if (index > 0) {
+                        return line.substring(0, index);
+                    }
+
+                    return line;
+                })
+                .sorted()
+                .collect(Collectors.toList());
+    }
+
 }

asyncapi-plugin/asyncapi-plugin-maven/src/test/java/com/asyncapi/plugin/maven/asyncapi/streetlights/StreetlightsAsyncAPI.java

@@ -229,7 +229,7 @@ private Map<String, Object> getSchemas() {
         Map<String, Schema> turnOnOffPayloadProperties = new HashMap<>();
         lightMeasuredPayloadProperties.put("command", Schema.builder()
                 .type(Type.STRING)
-                .enumValues(Arrays.asList("on", "off"))
+                .enumValue(Arrays.asList("on", "off"))
                 .description("Whether to turn on or off the light.")
                 .build()
         );

asyncapi-plugin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>asyncapi</artifactId>
         <groupId>com.asyncapi</groupId>
-        <version>1.0.0-EAP</version>
+        <version>1.0.0-EAP-1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.asyncapi</groupId>
     <artifactId>asyncapi</artifactId>
-    <version>1.0.0-EAP</version>
+    <version>1.0.0-EAP-1</version>
 
     <!-- Project Information -->
     <name>AsyncAPI</name>