Fixes AbstractJavaCodegenExampleValuesTest

Author: spacether

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -1230,7 +1230,7 @@ public void setParameterExampleValue(CodegenParameter param) {
             example = "new HashMap()";
         }
 
-        p.example = example;
+        param.example = example;
     }
 
     @Override

modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenExampleValuesTest.java

@@ -17,113 +17,124 @@
 
 package org.openapitools.codegen.java;
 
+import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.CodegenParameter;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.languages.AbstractJavaCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 
 public class AbstractJavaCodegenExampleValuesTest {
 
     private final AbstractJavaCodegen fakeJavaCodegen = new P_AbstractJavaCodegen();
 
-    @Test
-    void referencedEnumTakeFirstName() {
-        final CodegenParameter p = new CodegenParameter();
-        p.getSchema().allowableValues = Collections.singletonMap("values", Arrays.asList("first", "second"));
-        p.getSchema().dataType = "WrappedEnum";
-
-        fakeJavaCodegen.setParameterExampleValue(p);
-        Assert.assertEquals(p.example, "WrappedEnum.fromValue(\"first\")");
-    }
-
     @Test
     void inlineEnum() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().allowableValues = Collections.singletonMap("values", Arrays.asList("first", "second"));
-        p.getSchema().isEnum = true;
-        p.getSchema().dataType = "String";
-
+        Schema sc = new Schema();
+        sc.setType("string");
+        sc.setEnum(
+                Arrays.asList("first", "second")
+        );
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
         Assert.assertEquals(p.example, "\"first\"");
     }
 
     @Test
     void inlineEnumArray() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().allowableValues = Collections.singletonMap("values", Arrays.asList("first", "second"));
-        p.getSchema().isEnum = true;
-        p.getSchema().isArray = true;
-        p.getSchema().dataType = "List<String>";
-        p.getSchema().items = new CodegenProperty();
-
+        Schema sc = new Schema();
+        sc.setType("array");
+        Schema items = new Schema();
+        items.setType("string");
+        items.setEnum(
+                Arrays.asList("first", "second")
+        );
+        sc.setItems(items);
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
-        Assert.assertEquals(p.example, "Arrays.asList()");
+        Assert.assertEquals(p.example, "new List()");
     }
 
     @Test
     void dateDefault() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().isDate = true;
-        p.getSchema().dataType = "LocalDate";
-
+        Schema sc = new Schema();
+        sc.setType("string");
+        sc.setFormat("date");
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
-        Assert.assertEquals(p.example, "LocalDate.now()");
+        Assert.assertEquals(p.example, "new Date()");
     }
 
     @Test
     void dateGivenExample() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().isDate = true;
-        p.getSchema().dataType = "LocalDate";
-        p.example = "2017-03-30";
-
+        Schema sc = new Schema();
+        sc.setType("string");
+        sc.setFormat("date");
+        sc.setExample("2017-03-30");
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
-        Assert.assertEquals(p.example, "LocalDate.parse(\"2017-03-30\")");
+        Assert.assertEquals(p.example, "new Date()");
     }
 
     @Test
     void dateTimeDefault() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().isDateTime = true;
-        p.getSchema().dataType = "OffsetDateTime";
-
+        Schema sc = new Schema();
+        sc.setType("string");
+        sc.setFormat("date-time");
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
-        Assert.assertEquals(p.example, "OffsetDateTime.now()");
+        Assert.assertEquals(p.example, "new Date()");
     }
 
     @Test
     void dateTimeGivenExample() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().isDateTime = true;
-        p.getSchema().dataType = "OffsetDateTime";
-        p.example = "2007-12-03T10:15:30+01:00";
-
+        Schema sc = new Schema();
+        sc.setType("string");
+        sc.setFormat("date-time");
+        sc.setExample("2007-12-03T10:15:30+01:00");
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
-        Assert.assertEquals(p.example, "OffsetDateTime.parse(\"2007-12-03T10:15:30+01:00\")");
+        Assert.assertEquals(p.example, "new Date()");
     }
 
     @Test
     void uuidDefault() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().isUuid = true;
-        p.getSchema().dataType = "UUID";
-
+        Schema sc = new Schema();
+        sc.setType("string");
+        sc.setFormat("uuid");
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
         Assert.assertEquals(p.example, "UUID.randomUUID()");
     }
 
     @Test
     void uuidGivenExample() {
         final CodegenParameter p = new CodegenParameter();
-        p.getSchema().isUuid = true;
-        p.getSchema().dataType = "UUID";
-        p.example = "13b48713-b931-45ea-bd60-b07491245960";
-
+        Schema sc = new Schema();
+        sc.setType("string");
+        sc.setFormat("uuid");
+        sc.setExample("13b48713-b931-45ea-bd60-b07491245960");
+        CodegenProperty cp = fakeJavaCodegen.fromProperty("schema", sc, false, false, null);
+        p.setSchema(cp);
         fakeJavaCodegen.setParameterExampleValue(p);
         Assert.assertEquals(p.example, "UUID.fromString(\"13b48713-b931-45ea-bd60-b07491245960\")");
     }