fix: implement uuid format for string (#72)

Co-authored-by: Dale Lane <dale.lane@uk.ibm.com>

Author: dan-r

components/Demo/DemoProducer.js

@@ -24,6 +24,7 @@ export function DemoProducer({ params, messageName, className, constructorArgs }
 import ${params.package}.${className}Producer;
 import ${params.package}.ConnectionHelper;
 import ${params.package}.models.${messageName};
+import java.util.UUID;
 
 public class DemoProducer {
     public static void main(String[] args) {

components/Files/Models.js

@@ -32,6 +32,7 @@ export function Models(asyncapi, params) {
       <File name={`${packagePath}models/${messageNameUpperCase}.java`}>
         <PackageDeclaration path={`${params.package}.models`} />
         <ImportDeclaration path={`${params.package}.models.ModelContract`} />
+        <ImportDeclaration path={`java.util.UUID`} />
 
         <Class name={messageNameUpperCase} extendsClass="ModelContract">
           <Indent size={2} type={IndentationTypes.SPACES}>

components/Producer/KafkaProducer.js

@@ -67,6 +67,7 @@ export function ProducerImports({ params }) {
   return `
 import java.util.logging.*;
 import java.io.Serializable;
+import java.util.UUID;
 
 import ${params.package}.ConnectionHelper;
 import ${params.package}.LoggingHelper;

components/Producer/MQProducer.js

@@ -66,6 +66,7 @@ export function ProducerImports({ params }) {
   return `
 import java.util.logging.*;
 import java.io.Serializable;
+import java.util.UUID;
 
 import javax.jms.Destination;
 import javax.jms.JMSProducer;

test/Producer.test.js

@@ -59,6 +59,7 @@ test('Generates all imports from path', async() => {
   expect(testProducer.ProducerImports({asyncapi: generator.asyncapi, params: generator.templateParams})).toBe(`
 import java.util.logging.*;
 import java.io.Serializable;
+import java.util.UUID;
 
 import javax.jms.Destination;
 import javax.jms.JMSProducer;

test/Types.utils.test.js

@@ -18,10 +18,14 @@ test('Check string type is converted to String', () => {
   expect(typesUtils.asyncApiToJavaType('string')).toBe('String');
 });
 
-test('Check password type is converted to String', () => {
+test('Check password format is converted to String', () => {
   expect(typesUtils.asyncApiToJavaType('string', 'password')).toBe('String');
 });
 
+test('Check uuid format is converted to UUID', () => {
+  expect(typesUtils.asyncApiToJavaType('string', 'uuid')).toBe('UUID');
+});
+
 test('Check byte type is not changed', () => {
   expect(typesUtils.asyncApiToJavaType('string', 'byte')).toBe('byte');
 });
@@ -110,9 +114,9 @@ test('Create Java Args from Properties', async () => {
 
 // Test function asyncApiTypeToDemoValue
 test('Check integer type is a random number', () => {
-  expect(typesUtils.asyncApiTypeToDemoValue('integer')).toEqual(expect.any(Number));
+  expect(typesUtils.asyncApiToDemoValue('integer')).toEqual(expect.any(Number));
 });
 
 test('Unexpected type throws an error', () => {
-  expect(() => { typesUtils.asyncApiTypeToDemoValue('test');}).toThrow();
+  expect(() => { typesUtils.asyncApiToDemoValue('test');}).toThrow();
 });

utils/Types.utils.js

@@ -37,38 +37,40 @@ export function asyncApiToJavaType(type, format) {
 
 function asyncApiFormatToJavaType(format) {
   switch (format) {
-    case 'int32':
-      return 'int';
-    case 'int64':
-      return 'long';
-    case 'float':
-      return 'float';
-    case 'double':
-      return 'double';
-    case 'byte':
-      return 'byte';
-    case 'binary':
-      return 'String';
-    case 'date':
-      return 'String';
-    case 'date-time':
-      return 'String';
-    case 'password':
-      return 'String';
+  case 'int32':
+    return 'int';
+  case 'int64':
+    return 'long';
+  case 'float':
+    return 'float';
+  case 'double':
+    return 'double';
+  case 'byte':
+    return 'byte';
+  case 'binary':
+    return 'String';
+  case 'date':
+    return 'String';
+  case 'date-time':
+    return 'String';
+  case 'password':
+    return 'String';
+  case 'uuid':
+    return 'UUID';
   }
 }
 function asyncApiTypeToJavaType(type) {
   switch (type) {
-    case 'integer':
-      return 'int';
-    case 'number':
-      // using double by default, as no format
-      //  was specified
-      return 'double';
-    case 'string':
-      return 'String';
-    case 'boolean':
-      return 'boolean';
+  case 'integer':
+    return 'int';
+  case 'number':
+    // using double by default, as no format
+    //  was specified
+    return 'double';
+  case 'string':
+    return 'String';
+  case 'boolean':
+    return 'boolean';
   }
 }
 
@@ -115,25 +117,28 @@ export function createJavaArgsFromProperties(properties) {
  */
 export function createJavaConstructorArgs(properties) {
   return Object.entries(properties).map(([name, property]) => {
-    return `${asyncApiTypeToDemoValue(property.type())}`;
+    return `${asyncApiToDemoValue(property.type(), property.format())}`;
   });
 }
 
 /* 
  * Generates an example value from asyncAPI datatype in Java
  */
-export function asyncApiTypeToDemoValue(asyncApiType) {
+export function asyncApiToDemoValue(type, format) {
   const strWords = ['ASyncAPI', 'Java', 'React', 'Hackathon', 'Community', 'Open Source', 'Publish', 'Subscribe', 'Topic', 'Demo', 'Example', 'Template', 'Producer', 'Consumer', 'Generator', 'Message', 'Endpoint'];
   const boolWords = ['true', 'false'];
 
-  switch (asyncApiType) {
+  switch (type) {
   case ('integer' || 'long'):
     return parseInt(Math.random() * 1000, 10);
 
   case ('float' || 'double'):
     return Math.random();
 
   case ('string' || 'binary' || 'password'):
+    if (format === 'uuid') {
+      return 'UUID.randomUUID()';
+    }
     return `"${  strWords[Math.floor(Math.random()*strWords.length)]}"`;
 
   case 'byte':