[BUG] [Java] Invalid code generation for oneof types. OpenAPITools#18517

samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES

@@ -249,5 +249,3 @@ src/main/java/org/openapitools/client/model/Value.java
 src/main/java/org/openapitools/client/model/Variable.java
 src/main/java/org/openapitools/client/model/Whale.java
 src/main/java/org/openapitools/client/model/Zebra.java
-src/test/java/org/openapitools/client/model/FreeFormObjectTestClassPropertiesTest.java
-src/test/java/org/openapitools/client/model/FreeFormObjectTestClassTest.java

samples/client/petstore/java/okhttp-gson/docs/FreeFormObjectTestClass.md

@@ -0,0 +1,14 @@
+
+
+# FreeFormObjectTestClass
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**name** | **String** | | [optional] |
+|**properties** | [**FreeFormObjectTestClassProperties**](FreeFormObjectTestClassProperties.md) | | [optional] |
+
+
+

samples/client/petstore/java/okhttp-gson/docs/FreeFormObjectTestClassProperties.md

@@ -0,0 +1,12 @@
+
+
+# FreeFormObjectTestClassProperties
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+
+
+

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FreeFormObjectTestClassProperties.java

@@ -64,7 +64,6 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
  }
  final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
  final TypeAdapter<String> adapterString = gson.getDelegateAdapter(this, TypeToken.get(String.class));
-
  final Type typeInstance = new TypeToken<Map<String, Object>>(){}.getType();
  final TypeAdapter<Map<String, Object>> adapterMapStringObject = (TypeAdapter<Map<String, Object>>) gson.getDelegateAdapter(this, TypeToken.get(typeInstance));
 

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java

@@ -37,6 +37,28 @@ public void setup() {
  order = new Order();
  }
 
+ @Test
+ public void testOneOfFreeFormObject() {
+ final Map<String, Object> map = new LinkedHashMap<>();
+ map.put("someString", "abc");
+ map.put("someBoolean", false);
+
+ final String json1 = "{\"someString\":\"abc\",\"someBoolean\":false}";
+ final FreeFormObjectTestClassProperties properties = new FreeFormObjectTestClassProperties();
+ properties.setActualInstance(map);
+
+ assertEquals(json1, json.serialize(properties));
+ assertEquals(json.deserialize(json1, FreeFormObjectTestClassProperties.class), properties);
+
+
+ final String json2 = "\"abc\"";
+ final FreeFormObjectTestClassProperties properties2 = new FreeFormObjectTestClassProperties();
+ properties2.setActualInstance("abc");
+
+ assertEquals(json2, json.serialize(properties2));
+ assertEquals(json.deserialize(json2, FreeFormObjectTestClassProperties.class), properties2);
+ }
+
  @Test
  public void testSqlDateTypeAdapter() {
  final String str = "\"2015-11-07\"";