Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
# @return [String] The enum value
def build_from_hash(value)
return value if {{classname}}.all_vars.include?(value)
{{#enumUnknownDefaultCase}}
{{#allowableValues}}{{#enumVars}}{{#-last}}{{{name}}}{{/-last}}{{/enumVars}}{{/allowableValues}}
{{/enumUnknownDefaultCase}}
{{^enumUnknownDefaultCase}}
raise "Invalid ENUM value #{value} for class #{{{classname}}}"
{{/enumUnknownDefaultCase}}
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -762,4 +763,58 @@ public void testQueryParamJsonSerializationSetsQueryIsJsonMimeType() {
assertTrue(op.queryParams.stream().allMatch(p -> p.queryIsJsonMimeType),
"All content:application/json query params should have queryIsJsonMimeType=true");
}

@Test(description = "enumUnknownDefaultCase=true makes build_from_hash fall back to the unknown default member")
public void testEnumUnknownDefaultCaseBuildFromHashFallback() throws Exception {
final File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit();

final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/enum.yaml");
CodegenConfig codegenConfig = new RubyClientCodegen();
codegenConfig.additionalProperties().put(CodegenConstants.ENUM_UNKNOWN_DEFAULT_CASE, "true");
codegenConfig.setOutputDir(output.getAbsolutePath());

ClientOptInput clientOptInput = new ClientOptInput().openAPI(openAPI).config(codegenConfig);
new DefaultGenerator().opts(clientOptInput).generate();

Path stringEnum = new File(output, "lib/openapi_client/models/type.rb").toPath();
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
TestUtils.assertFileContains(stringEnum, "UNKNOWN_DEFAULT_OPEN_API = \"unknown_default_open_api\".freeze");
TestUtils.assertFileContains(stringEnum,
"def build_from_hash(value)\n" +
" return value if Type.all_vars.include?(value)\n" +
" UNKNOWN_DEFAULT_OPEN_API\n" +
" end");
TestUtils.assertFileNotContains(stringEnum, "raise \"Invalid ENUM value");

// the integer enum's unknown-default member keeps its (pre-existing) numeric-prefixed name
Path integerEnum = new File(output, "lib/openapi_client/models/integer_enum.rb").toPath();
TestUtils.assertFileContains(integerEnum, "Nunknown_default_open_api = 11184809.freeze");
TestUtils.assertFileContains(integerEnum,
"def build_from_hash(value)\n" +
" return value if IntegerEnum.all_vars.include?(value)\n" +
" Nunknown_default_open_api\n" +
" end");
TestUtils.assertFileNotContains(integerEnum, "raise \"Invalid ENUM value");
}

@Test(description = "without enumUnknownDefaultCase build_from_hash still raises on unknown values")
public void testEnumBuildFromHashRaisesByDefault() throws Exception {
final File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit();

final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/enum.yaml");
CodegenConfig codegenConfig = new RubyClientCodegen();
codegenConfig.setOutputDir(output.getAbsolutePath());

ClientOptInput clientOptInput = new ClientOptInput().openAPI(openAPI).config(codegenConfig);
new DefaultGenerator().opts(clientOptInput).generate();

Path stringEnum = new File(output, "lib/openapi_client/models/type.rb").toPath();
TestUtils.assertFileNotContains(stringEnum, "UNKNOWN_DEFAULT_OPEN_API");
TestUtils.assertFileContains(stringEnum,
"def build_from_hash(value)\n" +
" return value if Type.all_vars.include?(value)\n" +
" raise \"Invalid ENUM value #{value} for class #Type\"\n" +
" end");
}
}
Loading