[go-experimental] Fix multiple go compilation errors and enable go integration test

bin/openapi3/go-experimental-petstore.sh

@@ -34,6 +34,8 @@ rm -rf $STUB_DIR
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/$GENERATOR -i $SPEC -g $GENERATOR -o $STUB_DIR -DpackageName=petstore $@"
+ags="generate -t modules/openapi-generator/src/main/resources/$GENERATOR -i $SPEC -g $GENERATOR -o $STUB_DIR"
+ags="$ags --additional-properties enumClassPrefix=true,packageName=petstore"
+ags="$ags $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/openapi3/go-petstore.sh

@@ -34,6 +34,8 @@ rm -rf $STUB_DIR
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/go -i $SPEC -g $GENERATOR -o $STUB_DIR --additional-properties packageName=petstore $@"
+ags="generate -t modules/openapi-generator/src/main/resources/go -i $SPEC -g $GENERATOR -o $STUB_DIR"
+ags="$ags --additional-properties enumClassPrefix=true,packageName=petstore"
+ags="$ags $@"
 
 java $JAVA_OPTS -jar $executable $ags

bin/utils/ensure-up-to-date

@@ -66,6 +66,7 @@ declare -a samples=(
 "${root}/bin/csharp-netcore-petstore-all.sh"
 "${root}/bin/elixir-petstore.sh"
 "${root}/bin/openapi3/go-petstore.sh"
+"${root}/bin/openapi3/go-experimental-petstore.sh"
 "${root}/bin/go-experimental-petstore.sh"
 "${root}/bin/go-petstore.sh"
 "${root}/bin/go-petstore-withxml.sh"

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java

@@ -24,8 +24,16 @@
 
 @JsonIgnoreProperties({"parentModel", "interfaceModels"})
 public class CodegenModel implements IJsonSchemaValidationProperties {
+    // The parent model name from the schemas. The parent is determined by inspecting the allOf, anyOf and
+    // oneOf attributes in the OAS. First codegen inspects 'allOf', then 'anyOf', then 'oneOf'.
+    // If there are multiple object references in the attribute ('allOf', 'anyOf', 'oneOf'), and one of the
+    // object is a discriminator, that object is set as the parent. If no discriminator is specified,
+    // codegen returns the first one in the list, i.e. there is no obvious parent in the OpenAPI specification.
+    // When possible, the mustache templates should use 'allParents' to handle multiple parents.
     public String parent, parentSchema;
     public List<String> interfaces;
+    // The list of parent model name from the schemas. In order of preference, the parent is obtained
+    // from the 'allOf' attribute, then 'anyOf', and finally 'oneOf'.
     public List<String> allParents;
 
     // References to parent and interface CodegenModels. Only set when code generator supports inheritance.

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java

@@ -70,8 +70,8 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
     public boolean isBinary;
     public boolean isFile;
     public boolean isBoolean;
-    public boolean isDate;
-    public boolean isDateTime;
+    public boolean isDate; // full-date notation as defined by RFC 3339, section 5.6, for example, 2017-07-21
+    public boolean isDateTime; // the date-time notation as defined by RFC 3339, section 5.6, for example, 2017-07-21T17:32:28Z
     public boolean isUuid;
     public boolean isUri;
     public boolean isEmail;

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java

@@ -71,7 +71,6 @@ public void processOpts() {
 
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
-        objs = super.postProcessModels(objs);
 
         List<Map<String, Object>> models = (List<Map<String, Object>>) objs.get("models");
         for (Map<String, Object> m : models) {
@@ -83,16 +82,27 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
                 }
 
                 for (CodegenProperty param : model.vars) {
-                    if (!param.isNullable) {
+                    if (!param.isNullable || param.isMapContainer || param.isListContainer) {
                         continue;
                     }
-
-                    param.dataType = "Nullable" + Character.toUpperCase(param.dataType.charAt(0))
+                    if (param.isDateTime) {
+                        // Note this could have been done by adding the following line in processOpts(),
+                        // however, we only want to represent the DateTime object as NullableTime if
+                        // it's marked as nullable in the spec.
+                        //    typeMapping.put("DateTime", "NullableTime");
+                        param.dataType = "NullableTime";
+                    } else {
+                        param.dataType = "Nullable" + Character.toUpperCase(param.dataType.charAt(0))
                             + param.dataType.substring(1);
+                    }
                 }
             }
         }
 
+        // The superclass determines the list of required golang imports. The actual list of imports
+        // depends on which types are used, which is done in the code above. So super.postProcessModels
+        // must be invoked at the end of this method.
+        objs = super.postProcessModels(objs);
         return objs;
     }
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java

@@ -921,7 +921,8 @@ public static List<Schema> getInterfaces(ComposedSchema composed) {
     }
 
     /**
-     * Get the the parent model name from the schemas (allOf, anyOf, oneOf)
+     * Get the parent model name from the schemas (allOf, anyOf, oneOf).
+     * If there are multiple parents, return the first one.
      *
      * @param composedSchema schema (alias or direct reference)
      * @param allSchemas     all schemas
@@ -965,6 +966,14 @@ public static String getParentName(ComposedSchema composedSchema, Map<String, Sc
         return null;
     }
 
+    /**
+     * Get the list of parent model names from the schemas (allOf, anyOf, oneOf).
+     *
+     * @param composedSchema   schema (alias or direct reference)
+     * @param allSchemas       all schemas
+     * @param includeAncestors if true, include the indirect ancestors in the return value. If false, return the direct parents.
+     * @return the name of the parent model
+     */
     public static List<String> getAllParentsName(ComposedSchema composedSchema, Map<String, Schema> allSchemas, boolean includeAncestors) {
         List<Schema> interfaces = getInterfaces(composedSchema);
         List<String> names = new ArrayList<String>();

modules/openapi-generator/src/main/resources/go-experimental/README.mustache

@@ -25,7 +25,6 @@ Install the following dependencies:
 go get github.com/stretchr/testify/assert
 go get golang.org/x/oauth2
 go get golang.org/x/net/context
-go get github.com/antihax/optional
 ```
 
 Put the package under your project folder and add the following in import:

modules/openapi-generator/src/main/resources/go-experimental/go.mod.mustache

@@ -3,6 +3,5 @@ module {{gitHost}}/{{gitUserId}}/{{gitRepoId}}{{#isGoSubmodule}}/{{packageName}}
 go 1.13
 
 require (
-	github.com/antihax/optional v1.0.0
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 )

modules/openapi-generator/src/main/resources/go/api.mustache

@@ -135,14 +135,16 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 	{{#queryParams}}
 	{{#required}}
 	{{#isCollectionFormatMulti}}
-	t:={{paramName}}
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
-		s := reflect.ValueOf(t)
-		for i := 0; i < s.Len(); i++ {
-			localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
+	{
+		t:={{paramName}}
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
+			}
+		} else {
+			localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
 		}
-	} else {
-		localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
 	}
 	{{/isCollectionFormatMulti}}
 	{{^isCollectionFormatMulti}}

pom.xml

@@ -1087,6 +1087,8 @@
                 <!-- test non-java projects -->
                 <module>samples/client/petstore/go</module>
                 <module>samples/client/petstore/go-experimental</module>
+                <module>samples/openapi3/client/petstore/go-experimental</module>
+                <module>samples/openapi3/client/petstore/go</module>
                 <!-- test java-related projects -->
                 <!--<module>samples/client/petstore/scala-akka</module>-->
                 <module>samples/client/petstore/scala-httpclient</module>

samples/client/petstore/go-experimental/go-petstore/README.md

@@ -17,7 +17,6 @@ Install the following dependencies:
 go get github.com/stretchr/testify/assert
 go get golang.org/x/oauth2
 go get golang.org/x/net/context
-go get github.com/antihax/optional
 ```
 
 Put the package under your project folder and add the following in import:

samples/client/petstore/go-experimental/go-petstore/go.mod

@@ -3,6 +3,5 @@ module github.com/GIT_USER_ID/GIT_REPO_ID
 go 1.13
 
 require (
-	github.com/antihax/optional v1.0.0
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 )

samples/client/petstore/go-experimental/pet_api_test.go

@@ -139,7 +139,10 @@ func TestFindPetsByStatus(t *testing.T) {
 }
 
 func TestUploadFile(t *testing.T) {
-	file, _ := os.Open("../python/testfiles/foo.png")
+	file, err1 := os.Open("testfiles/foo.png")
+	if err1 != nil {
+		t.Fatalf("Error opening file: %v", err1)
+	}
 
 	_, r, err := client.PetApi.UploadFile(context.Background(), 12830).AdditionalMetadata("golang").File(file).Execute()
 
@@ -154,7 +157,10 @@ func TestUploadFile(t *testing.T) {
 
 func TestUploadFileRequired(t *testing.T) {
 	return // remove when server supports this endpoint
-	file, _ := os.Open("../python/testfiles/foo.png")
+	file, err1 := os.Open("testfiles/foo.png")
+	if err1 != nil {
+		t.Fatalf("Error opening file: %v", err1)
+	}
 
 	_, r, err := client.PetApi.UploadFileWithRequiredFile(context.Background(), 12830).RequiredFile(file).AdditionalMetadata("golang").Execute()
 

samples/client/petstore/go-experimental/pom.xml

@@ -68,20 +68,6 @@
                             </arguments>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>go-get-optional</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>go</executable>
-                            <arguments>
-                                <argument>get</argument>
-                                <argument>github.com/antihax/optional</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>go-test</id>
                         <phase>integration-test</phase>

samples/client/petstore/go/go-petstore/api_fake.go

@@ -1216,14 +1216,16 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context
 	localVarQueryParams.Add("ioutil", parameterToString(ioutil, "csv"))
 	localVarQueryParams.Add("http", parameterToString(http, "space"))
 	localVarQueryParams.Add("url", parameterToString(url, "csv"))
-	t:=context
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
-		s := reflect.ValueOf(t)
-		for i := 0; i < s.Len(); i++ {
-			localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+	{
+		t:=context
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+			}
+		} else {
+			localVarQueryParams.Add("context", parameterToString(t, "multi"))
 		}
-	} else {
-		localVarQueryParams.Add("context", parameterToString(t, "multi"))
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}

samples/client/petstore/go/pet_api_test.go

@@ -142,7 +142,10 @@ func TestFindPetsByStatus(t *testing.T) {
 }
 
 func TestUploadFile(t *testing.T) {
-	file, _ := os.Open("../python/testfiles/foo.png")
+	file, err1 := os.Open("testfiles/foo.png")
+	if err1 != nil {
+		t.Fatalf("Error opening file: %v", err1)
+	}
 
 	_, r, err := client.PetApi.UploadFile(context.Background(), 12830, &sw.UploadFileOpts{
 		AdditionalMetadata: optional.NewString("golang"),
@@ -160,7 +163,10 @@ func TestUploadFile(t *testing.T) {
 
 func TestUploadFileRequired(t *testing.T) {
 	return // remove when server supports this endpoint
-	file, _ := os.Open("../python/testfiles/foo.png")
+	file, err1 := os.Open("testfiles/foo.png")
+	if err1 != nil {
+		t.Fatalf("Error opening file: %v", err1)
+	}
 
 	_, r, err := client.PetApi.UploadFileWithRequiredFile(context.Background(), 12830,
 		file,