Multiple changes in the Ecore2AsyncApi transformation:

* Update README.md file to keep it consistent.
* Add annotation and support custom names for Messages and Schemas.
* Add annotation and support for titles in Schemas and properties.
* Add annotation and support for parameters in Channel names.

Author: abelgomez

README.md

@@ -243,9 +243,9 @@ import java.time.LocalDateTime;
 import java.util.UUID;
 
 import schemas.LightMeasuredPayload;
-import smartylighting.streetlights._1._0.event.__streetlightId_.lighting.measured.PublishLightMeasured;
-import smartylighting.streetlights._1._0.event.__streetlightId_.lighting.measured.PublishLightMeasured.PublishLightMeasuredParams;
-import smartylighting.streetlights._1._0.event.__streetlightId_.lighting.measured.SubscribeLightMeasured;
+import smartylighting.streetlights._1._0.event._streetlightId_.lighting.measured.PublishLightMeasured;
+import smartylighting.streetlights._1._0.event._streetlightId_.lighting.measured.PublishLightMeasured.PublishLightMeasuredParams;
+import smartylighting.streetlights._1._0.event._streetlightId_.lighting.measured.SubscribeLightMeasured;
 
 public class MainExample {
 	public static void main(String[] args) throws Exception {
@@ -299,10 +299,13 @@ public class MainExample {
 It is possible to generate an skeleton AsyncAPI Specification from an Ecore model. The generator will create a reusable JSON Schema for each domain class. Channels will be created out of annotated EClasses. Moreover, hosts information can also be specified via EAnnotations. Currently, the following EAnnotations are allowed:
 
 
-| Ecore Element | EAnnotation Source                                         | Description
-| ------------- | ---------------------------------------------------------- | -----------
-| EPackage      | `http://io.github.abelgomez/asyncapi/eAnnotations/Server`  | List of Servers. Expect entries: `name` (Server name), `url` (Server url, including port) and `protocol` (AsyncAPI supported protocol).
-| EClass        | `http://io.github.abelgomez/asyncapi/eAnnotations/Channel` | The EClass represents the Payload of a given Channel. Expected entries: `name` (Channel name), `description` (Channel description), `publish` (publish `operationId`) and `subscribe` (subscribe `operationId`).
+| Ecore Element      | EAnnotation Source                                         | Description
+| ------------------ | ---------------------------------------------------------- | -----------
+| EPackage           | `http://io.github.abelgomez/asyncapi/eAnnotations/Server`  | List of Servers. Expect entries: `name` (Server name), `url` (Server url, including port) and `protocol` (AsyncAPI supported protocol).
+| EClass             | `http://io.github.abelgomez/asyncapi/eAnnotations/Channel` | The EClass represents the Payload of a given Channel. Expected entries: `name` (Channel name), `description` (Channel description), `publish` (publish `operationId`) and `subscribe` (subscribe `operationId`).
+| EClass             | `http://io.github.abelgomez/asyncapi/eAnnotations/Message` | The EClass represents the Payload of a given Message. Expected entries: `name` (Message name).
+| EClass             | `http://io.github.abelgomez/asyncapi/eAnnotations/Schema`  | The EClass represents a Payload. Expected entries: `name` (Schema name), `title` (Friendly name of the Schema).
+| EStructuralFeature | `http://io.github.abelgomez/asyncapi/eAnnotations/Schema`  | The EStructuralFeature is a property part of a Payload. Expected entries: `title` (Friendly name for the property).
 
 This is a possible example Ecore file demonstrating these annotations:
 

plugins/io.github.abelgomez.asyncapi/src/io/github/abelgomez/asyncapi/generator/Ecore2AsyncApi.xtend

@@ -32,6 +32,10 @@ import org.eclipse.emf.ecore.util.Diagnostician
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl
 import org.eclipse.xtext.EcoreUtil2
+import io.github.abelgomez.asyncapi.asyncApi.Parameter
+import io.github.abelgomez.asyncapi.asyncApi.NamedParameter
+import io.github.abelgomez.asyncapi.asyncApi.AbstractParameter
+import java.util.List
 
 class Ecore2AsyncApi {
 
@@ -48,6 +52,14 @@ class Ecore2AsyncApi {
 	public static final String EANNOTATION_CHANNEL_DESCRIPTION = "description"
 	public static final String EANNOTATION_CHANNEL_PUBLISH = "publish"
 	public static final String EANNOTATION_CHANNEL_SUBSCRIBE = "subscribe"
+	public static final String EANNOTATION_CHANNEL_PARAMETERS= "parameters"
+
+	public static final String EANNOTATION_MESSAGE = BASE_EANNOTATION_URI + "Message"
+	public static final String EANNOTATION_MESSAGE_NAME = "name"
+
+	public static final String EANNOTATION_SCHEMA = BASE_EANNOTATION_URI + "Schema"
+	public static final String EANNOTATION_SCHEMA_NAME = "name"
+	public static final String EANNOTATION_SCHEMA_TITLE = "title"
 
 	static def CharSequence generate(EPackage ePackage) {
 		return ePackage.asyncApi.generate
@@ -92,12 +104,35 @@ class Ecore2AsyncApi {
 	static def CharSequence generate(Channel c) '''
 	"«c.name»" : {
 		"description" : "«c.description»"«
+		IF !c.parameters.empty»,
+		"parameters" : {
+			«c.parameters.map[generate].join(",\n")»
+		}«ENDIF»«
 		IF c.publish !== null»,
 		"publish" : «c.publish.generate»«ENDIF»«
 		IF c.subscribe !== null»,
 		"subscribe" : «c.subscribe.generate»«ENDIF»
 	}'''
 
+	static def CharSequence generate(NamedParameter np) '''
+	"«np.name»" : «np.parameter.generate»'''
+
+	static def CharSequence generate(AbstractParameter abp) '''
+		«if (abp instanceof Parameter)
+			abp.generate
+		else if (abp instanceof Reference)
+			abp.generate
+		»'''
+
+	static def CharSequence generate(Parameter p) '''
+	{
+		"schema" : «p.schema.generate»«
+		IF p.description !== null»,
+		"description" : "«p.description»"«ENDIF»«
+		IF p.location !== null»,
+		"location" : «p.location»«ENDIF»
+	}'''
+
 	static def CharSequence generate(Operation o) '''
 	{
 		"operationId" : "«o.operationId»",
@@ -139,6 +174,8 @@ class Ecore2AsyncApi {
 	static def CharSequence generate(Schema s) '''
 	{
 		"type" : "«s.type.getName»"«
+		IF s.title !== null»,
+		"title" : "«s.title»"«ENDIF»«
 		IF !s.properties.empty»,
 		"properties" : {
 			«s.properties.map[generate].join(",\n")»
@@ -201,25 +238,22 @@ class Ecore2AsyncApi {
 		].map [
 			val eClass = it
 			AsyncApiFactory.eINSTANCE.createChannel => [
-				name = EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL, EANNOTATION_CHANNEL_NAME)
-				description = EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL, EANNOTATION_CHANNEL_DESCRIPTION)
-				if (EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL,
-					Ecore2AsyncApi.EANNOTATION_CHANNEL_PUBLISH) !== null) {
+				name = eClass.channelName
+				description = eClass.channelDescription
+				parameters += eClass.channelParameters.map[namedParameter]
+				if (eClass.channelPublishOp !== null) {
 					publish = AsyncApiFactory.eINSTANCE.createOperation => [
-						operationId = EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL,
-							Ecore2AsyncApi.EANNOTATION_CHANNEL_PUBLISH)
+						operationId = eClass.channelPublishOp
 						message = AsyncApiFactory.eINSTANCE.createReference => [
-							uri = "#/components/messages/" + eClass.name
+							uri = "#/components/messages/" + eClass.messageName
 						]
 					]
 				}
-				if (EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL,
-					Ecore2AsyncApi.EANNOTATION_CHANNEL_SUBSCRIBE) !== null) {
+				if (eClass.channelSubscribeOp !== null) {
 					subscribe = AsyncApiFactory.eINSTANCE.createOperation => [
-						operationId = EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL,
-							Ecore2AsyncApi.EANNOTATION_CHANNEL_SUBSCRIBE)
+						operationId = eClass.channelSubscribeOp
 						message = AsyncApiFactory.eINSTANCE.createReference => [
-							uri = "#/components/messages/" + eClass.name
+							uri = "#/components/messages/" + eClass.messageName
 						]
 					]
 				}
@@ -230,19 +264,17 @@ class Ecore2AsyncApi {
 	static def Iterable<NamedMessage> allMessages(EPackage ePackage) {
 		return EcoreUtil2.getAllContentsOfType(ePackage, EClass).filter [
 			EAnnotations.exists [
-				source == EANNOTATION_CHANNEL &&
-					(details.get(Ecore2AsyncApi.EANNOTATION_CHANNEL_PUBLISH) !==
-						null ||
-						details.get(
-							Ecore2AsyncApi.EANNOTATION_CHANNEL_SUBSCRIBE) !== null
-				)
+				source == EANNOTATION_CHANNEL 
+					&& (details.get(EANNOTATION_CHANNEL_PUBLISH) !== null 
+						|| details.get(EANNOTATION_CHANNEL_SUBSCRIBE) !== null
+					)
 			]
 		].map [
 			val eClass = it
 			AsyncApiFactory.eINSTANCE.createNamedMessage => [
-				name = eClass.name
+				name = eClass.messageName
 				message = AsyncApiFactory.eINSTANCE.createReference => [
-					uri = "#/components/schemas/" + eClass.name
+					uri = "#/components/schemas/" + eClass.schemaName
 				]
 			]
 		]
@@ -252,15 +284,27 @@ class Ecore2AsyncApi {
 		return EcoreUtil2.getAllContentsOfType(ePackage, EClass).map [
 			val eClass = it
 			AsyncApiFactory.eINSTANCE.createNamedSchema => [
-				name = eClass.name
+				name = eClass.schemaName
 				schema = AsyncApiFactory.eINSTANCE.createSchema => [
 					type = JsonType.OBJECT
+					title = eClass.schemaTitle
 					properties += eClass.EAllStructuralFeatures.map[schema]
 				]
 			]
 		]
 	}
 
+	static def NamedParameter namedParameter(String parameterName) {
+		return AsyncApiFactory.eINSTANCE.createNamedParameter => [
+			name = parameterName
+			parameter = AsyncApiFactory.eINSTANCE.createParameter => [
+				schema = AsyncApiFactory.eINSTANCE.createSchema => [
+					type = JsonType.STRING
+				]
+			]
+		]
+	}
+	
 	static def NamedSchema schema(EStructuralFeature eStructuralFeature) {
 		return AsyncApiFactory.eINSTANCE.createNamedSchema => [
 			name = eStructuralFeature.name
@@ -274,6 +318,9 @@ class Ecore2AsyncApi {
 					maxItems = eStructuralFeature.upperBound
 				]
 			}
+			if (eStructuralFeature.schemaTitle !== null && schema instanceof Schema) {
+				(schema as Schema).title = eStructuralFeature.schemaTitle
+			}
 		]
 	}
 	
@@ -329,6 +376,41 @@ class Ecore2AsyncApi {
 
 	}
 
+	static def String channelName(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL, EANNOTATION_CHANNEL_NAME)
+	}
+	
+	static def String channelDescription(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL, EANNOTATION_CHANNEL_DESCRIPTION)
+	}
+	
+	static def List<String> channelParameters(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL, EANNOTATION_CHANNEL_PARAMETERS).split(",").map[trim]
+	}
+	
+	static def String channelPublishOp(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL, EANNOTATION_CHANNEL_PUBLISH)
+	}
+	
+	static def String channelSubscribeOp(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_CHANNEL, EANNOTATION_CHANNEL_SUBSCRIBE)
+	}
+	
+	static def String messageName(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_MESSAGE, EANNOTATION_MESSAGE_NAME) ?: eClass.name
+	}
+
+	static def String schemaName(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_SCHEMA, EANNOTATION_SCHEMA_NAME) ?: eClass.name
+	}
+
+	static def String schemaTitle(EClass eClass) {
+		return EcoreUtil.getAnnotation(eClass, EANNOTATION_SCHEMA, EANNOTATION_SCHEMA_TITLE)
+	}
+	
+	static def String schemaTitle(EStructuralFeature eStructuralFeature) {
+		return EcoreUtil.getAnnotation(eStructuralFeature, EANNOTATION_SCHEMA, EANNOTATION_SCHEMA_TITLE)
+	}
 
 	// Utility public methods
 	static def String diagnoseEcoreFile(IPath path) {