modules
openapi-generator-cli/src
main/java/org/openapitools/codegen/cmd
Generate.java +7 -0
test/java/org/openapitools/codegen/cmd
GenerateTest.java +6 -0
openapi-generator-core/…/…/…/…/…/…/…
WorkflowSettings.java +15 -0
openapi-generator/src
main/java/org/openapitools/codegen
config
CodegenConfigurator.java +6 -0
CodegenConfig.java +4 -0
CodegenConstants.java +5 -0
DefaultCodegen.java +28 -0
DefaultGenerator.java +1 -1
InlineModelResolver.java +52 -29
test
java/org/openapitools/codegen
options
BashClientOptionsProvider.java +1 -0
DartClientOptionsProvider.java +1 -0
DartDioClientOptionsProvider.java +1 -0
DartDioNextClientOptionsProvider.java +1 -0
ElixirClientOptionsProvider.java +1 -0
HaskellServantOptionsProvider.java +1 -0
PhpClientOptionsProvider.java +1 -0
PhpLumenServerOptionsProvider.java +1 -0
PhpSilexServerOptionsProvider.java +1 -0
PhpSlim4ServerOptionsProvider.java +1 -0
PhpSlimServerOptionsProvider.java +1 -0
RubyClientOptionsProvider.java +1 -0
ScalaAkkaClientOptionsProvider.java +1 -0
ScalaHttpClientOptionsProvider.java +2 -1
Swift4OptionsProvider.java +1 -0
Swift5OptionsProvider.java +1 -0
TypeScriptAngularClientOptionsProvider.java +1 -0
TypeScriptAngularJsClientOptionsProvider.java +1 -0
TypeScriptAureliaClientOptionsProvider.java +1 -0
TypeScriptFetchClientOptionsProvider.java +1 -0
TypeScriptNestjsClientOptionsProvider.java +1 -0
TypeScriptNodeClientOptionsProvider.java +1 -0
InlineModelResolverTest.java +38 -1
resources/3_0
issue_3100.yaml +100 -0
+ 6
- 0
@@ -477,6 +477,11 @@ public class CodegenConfigurator {
@@ -592,6 +597,7 @@ public class CodegenConfigurator {
+ 6
- 0
@@ -477,6 +477,11 @@ public class CodegenConfigurator {
@@ -592,6 +597,7 @@ public class CodegenConfigurator {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -385,4 +385,9 @@ public class CodegenConstants {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -250,6 +250,9 @@ public class DefaultCodegen implements CodegenConfig {
@@ -368,6 +371,10 @@ public class DefaultCodegen implements CodegenConfig {
@@ -1229,6 +1236,10 @@ public class DefaultCodegen implements CodegenConfig {
@@ -1537,6 +1548,8 @@ public class DefaultCodegen implements CodegenConfig {
@@ -6505,6 +6518,21 @@ public class DefaultCodegen implements CodegenConfig {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -859,7 +859,7 @@ public class DefaultGenerator implements Generator {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -53,7 +53,11 @@ public class InlineModelResolver {
@@ -65,7 +69,7 @@ public class InlineModelResolver {
@@ -370,7 +374,7 @@ public class InlineModelResolver {
@@ -381,29 +385,48 @@ public class InlineModelResolver {
@@ -414,7 +437,7 @@ public class InlineModelResolver {
@@ -426,9 +449,9 @@ public class InlineModelResolver {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -72,6 +72,7 @@ public class BashClientOptionsProvider implements OptionsProvider {
@@ -64,6 +64,7 @@ public class DartClientOptionsProvider implements OptionsProvider {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -68,6 +68,7 @@ public class DartDioClientOptionsProvider implements OptionsProvider {
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
@@ -64,6 +64,7 @@ public class DartDioNextClientOptionsProvider implements OptionsProvider {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -45,6 +45,7 @@ public class ElixirClientOptionsProvider implements OptionsProvider {
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -50,6 +50,7 @@ public class HaskellServantOptionsProvider implements OptionsProvider {