feat: adds format in options instead of using original input

asyncapi · Aug 15, 2023 · f438fc5 · f438fc5
1 parent 33c66a4
commit f438fc5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/src/generators/java/JavaConstrainer.ts b/src/generators/java/JavaConstrainer.ts
@@ -138,26 +138,19 @@ export const JavaDefaultTypeMapping: JavaTypeMapping = {
     return type;
   },
   String({ constrainedModel }): string {
-    let type = 'String';
-    const format =
-      constrainedModel.originalInput &&
-      constrainedModel.originalInput['format'];
-    switch (format) {
+    switch (constrainedModel.options.format) {
       case 'date':
-        type = 'java.time.LocalDate';
-        break;
+        return 'java.time.LocalDate';
       case 'time':
-        type = 'java.time.OffsetTime';
-        break;
+        return 'java.time.OffsetTime';
       case 'dateTime':
       case 'date-time':
-        type = 'java.time.OffsetDateTime';
-        break;
+        return 'java.time.OffsetDateTime';
       case 'binary':
-        type = 'byte[]';
-        break;
+        return 'byte[]';
+      default:
+        return 'String';
     }
-    return type;
   },
   Boolean({ constrainedModel }): string {
     return constrainedModel.options.isNullable ? 'Boolean' : 'boolean';

diff --git a/src/helpers/CommonModelToMetaModel.ts b/src/helpers/CommonModelToMetaModel.ts
@@ -40,6 +40,10 @@ function getMetaModelOptions(commonModel: CommonModel): MetaModelOptions {
     };
   }
 
+  if (commonModel.format) {
+    options.format = commonModel.format;
+  }
+
   return options;
 }
 

diff --git a/src/interpreter/Interpreter.ts b/src/interpreter/Interpreter.ts
@@ -135,6 +135,9 @@ export class Interpreter {
     if (schema.required !== undefined) {
       model.required = schema.required;
     }
+    if (schema.format) {
+      model.format = schema.format;
+    }
 
     interpretPatternProperties(schema, model, this, interpreterOptions);
     interpretAdditionalItems(schema, model, this, interpreterOptions);

diff --git a/src/models/CommonModel.ts b/src/models/CommonModel.ts
@@ -22,6 +22,7 @@ export class CommonModel {
   enum?: any[];
   const?: unknown;
   discriminator?: string;
+  format?: string;
   items?: CommonModel | CommonModel[];
   properties?: { [key: string]: CommonModel };
   additionalProperties?: CommonModel;

diff --git a/src/models/ConstrainedMetaModel.ts b/src/models/ConstrainedMetaModel.ts
@@ -20,6 +20,7 @@ export class ConstrainedMetaModelOptions extends MetaModelOptions {
   const?: ConstrainedMetaModelOptionsConst;
   discriminator?: ConstrainedMetaModelOptionsDiscriminator;
   isNullable?: boolean = false;
+  format?: string;
 }
 
 export abstract class ConstrainedMetaModel extends MetaModel {

diff --git a/src/models/MetaModel.ts b/src/models/MetaModel.ts
@@ -10,6 +10,7 @@ export class MetaModelOptions {
   const?: MetaModelOptionsConst;
   discriminator?: MetaModelOptionsDiscriminator;
   isNullable?: boolean = false;
+  format?: string;
 }
 
 export class MetaModel {