Skip to content

Commit fd06d31

Browse files
authored
Add base-package available for custom config key (#800)
* Add base-package available for custom config key * Add full package name
1 parent 8a1db04 commit fd06d31

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,7 @@ private static OpenApiClientGeneratorWrapper createGeneratorWrapper(Path openApi
295295
}
296296

297297
private String getBasePackage(final Config config, final Path openApiFilePath) {
298-
return config
299-
.getOptionalValue(getSpecConfigName(BASE_PACKAGE, openApiFilePath), String.class)
298+
return getValues(config, openApiFilePath, BASE_PACKAGE, String.class)
300299
.orElse(String.format("%s.%s", DEFAULT_PACKAGE, getSanitizedFileName(openApiFilePath)));
301300
}
302301

client/integration-tests/config-key/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
quarkus.rest-client.custom_config_key.url=http://localhost:8080
33
quarkus.openapi-generator.codegen.spec.config_key_openapi_yaml.config-key=custom_config_key
44
quarkus.openapi-generator.codegen.spec.custom_config_key.mutiny=true
5+
quarkus.openapi-generator.codegen.spec.custom_config_key.base-package=com.oapi.pkg
56

67
# use the @AnotherCustomAnnotation with `config_key_openapi_yaml`
78
quarkus.openapi-generator.codegen.spec.config_key_openapi_yaml.additional-api-type-annotations=@io.quarkiverse.openapi.generator.configkey.AnotherCustomAnnotation

client/integration-tests/config-key/src/test/java/io/quarkiverse/openapi/generator/configkey/QuarkusConfigKeyOpenApiTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import org.eclipse.microprofile.rest.client.inject.RestClient;
99
import org.junit.jupiter.api.Tag;
1010
import org.junit.jupiter.api.Test;
11-
import org.openapi.quarkus.config_key_openapi_yaml.api.ReactiveGreetingResourceApi;
1211
import org.openapi.quarkus.empty_config_key_yaml.api.DefaultApi;
1312

13+
import com.oapi.pkg.api.ReactiveGreetingResourceApi;
14+
1415
import io.quarkus.test.junit.QuarkusTest;
1516
import io.smallrye.mutiny.Uni;
1617

@@ -40,6 +41,7 @@ void config_key_apiIsBeingGenerated() throws NoSuchMethodException {
4041
@Test
4142
void config_key_customAnnotation() {
4243
assertThat(ReactiveGreetingResourceApi.class.getAnnotation(CustomAnnotation.class)).isNotNull();
44+
assertThat(ReactiveGreetingResourceApi.class.getPackageName()).isEqualTo("com.oapi.pkg.api");
4345
}
4446

4547
@Test

0 commit comments

Comments
 (0)