Skip to content

Commit 1eca27c

Browse files
author
Ole Lensmar
committed
fixed overriding of info in BeanConfig and creation of empty consumes/produces properties
1 parent 21ea2d3 commit 1eca27c

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,15 @@ protected void readSwaggerConfig(Class<?> cls, SwaggerDefinition config) {
437437
readInfoConfig(config);
438438

439439
for (String consume : config.consumes()) {
440-
swagger.addConsumes(consume);
440+
if( StringUtils.isNotEmpty( consume )) {
441+
swagger.addConsumes(consume);
442+
}
441443
}
442444

443445
for (String produce : config.produces()) {
444-
swagger.addProduces(produce);
446+
if( StringUtils.isNotEmpty( produce )) {
447+
swagger.addProduces(produce);
448+
}
445449
}
446450

447451
if (!config.externalDocs().value().isEmpty()) {

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/BeanConfig.java

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import io.swagger.models.License;
1313
import io.swagger.models.Scheme;
1414
import io.swagger.models.Swagger;
15+
import org.apache.commons.lang3.StringUtils;
1516
import org.reflections.Reflections;
1617
import org.reflections.scanners.ResourcesScanner;
1718
import org.reflections.scanners.SubTypesScanner;
@@ -195,11 +196,26 @@ public Set<Class<?>> classes() {
195196

196197
config.setScanners(new ResourcesScanner(), new TypeAnnotationsScanner(), new SubTypesScanner());
197198

198-
this.info = new Info()
199-
.description(description)
200-
.title(title)
201-
.version(version)
202-
.termsOfService(termsOfServiceUrl);
199+
info = getSwagger().getInfo();
200+
if( info == null ){
201+
info = new Info();
202+
}
203+
204+
if(StringUtils.isNotBlank(description)){
205+
info.description( description );
206+
}
207+
208+
if( StringUtils.isNotBlank( title )){
209+
info.title(title);
210+
}
211+
212+
if( StringUtils.isNotBlank(version)){
213+
info.version(version);
214+
}
215+
216+
if( StringUtils.isNotBlank(termsOfServiceUrl)){
217+
info.termsOfService(termsOfServiceUrl);
218+
}
203219

204220
if (contact != null) {
205221
this.info.contact(new Contact()

0 commit comments

Comments
 (0)