From 2ff9be6f95ac55ce92af5cdf23d8dc2cb3e22106 Mon Sep 17 00:00:00 2001
From: jburgess <11861789+jburgess@users.noreply.github.com>
Date: Tue, 7 Apr 2020 04:42:20 -0400
Subject: [PATCH] [codegen] Fix 'super.HashCode' for oneOf and allOf
 Implementations (retry) (#5830)

* Added hasVars after completion of all model post-processing (#5587)

* Post ensure-up-to-date

* Update to check the size of vars and not assume non-null
---
 .../org/openapitools/codegen/DefaultCodegen.java   |  1 +
 .../dart2/openapi/.openapi-generator/VERSION       |  2 +-
 samples/schema/petstore/mysql/mysql_schema.sql     | 14 ++++++++++++++
 .../petstore/php-slim4/.openapi-generator/VERSION  |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index b94bc71454e..7a8a8544d84 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -2320,6 +2320,7 @@ public class DefaultCodegen implements CodegenConfig {
             for (CodegenProperty prop : m.vars) {
                 postProcessModelProperty(m, prop);
             }
+            m.hasVars = m.vars.size() > 0;
         }
         if (m.allVars != null) {
             for (CodegenProperty prop : m.allVars) {
diff --git a/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION
index bfbf77eb7fa..b5d898602c2 100644
--- a/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.0-SNAPSHOT
\ No newline at end of file
+4.3.1-SNAPSHOT
\ No newline at end of file
diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql
index 21145731600..06e99f97875 100644
--- a/samples/schema/petstore/mysql/mysql_schema.sql
+++ b/samples/schema/petstore/mysql/mysql_schema.sql
@@ -245,6 +245,13 @@ CREATE TABLE IF NOT EXISTS `EnumArrays` (
   `array_enum` JSON DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
+--
+-- Table structure for table `EnumClass` generated from model 'EnumClass'
+--
+
+CREATE TABLE IF NOT EXISTS `EnumClass` (
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
 --
 -- Table structure for table `Enum_Test` generated from model 'EnumUnderscoreTest'
 --
@@ -377,6 +384,13 @@ CREATE TABLE IF NOT EXISTS `OuterComposite` (
   `my_boolean` TINYINT(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
+--
+-- Table structure for table `OuterEnum` generated from model 'OuterEnum'
+--
+
+CREATE TABLE IF NOT EXISTS `OuterEnum` (
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
 --
 -- Table structure for table `Pet` generated from model 'Pet'
 --
diff --git a/samples/server/petstore/php-slim4/.openapi-generator/VERSION b/samples/server/petstore/php-slim4/.openapi-generator/VERSION
index bfbf77eb7fa..b5d898602c2 100644
--- a/samples/server/petstore/php-slim4/.openapi-generator/VERSION
+++ b/samples/server/petstore/php-slim4/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.0-SNAPSHOT
\ No newline at end of file
+4.3.1-SNAPSHOT
\ No newline at end of file