Skip to content

Commit 1e2a453

Browse files
committed
minor cleanup
1 parent 71a7c77 commit 1e2a453

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

bootique-swagger/src/main/java/io/bootique/swagger/OpenApiLoader.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ public OpenAPI load(List<String> resourcePackages, List<String> resourceClasses,
4848
OpenAPI specFromAnnotations = !resourcePackages.isEmpty() || !resourceClasses.isEmpty()
4949
? loadSpecFromAnnotations(empty, resourcePackages, resourceClasses) : empty;
5050
OpenAPI spec = specLocation != null ? OpenApiMerger.merge(specFromAnnotations, loadSpec(specLocation)) : specFromAnnotations;
51-
OpenAPI specOverride = overrideSpecLocation != null ? OpenApiMerger.merge(spec, loadSpec(overrideSpecLocation)) : spec;
5251

53-
return specOverride;
52+
return overrideSpecLocation != null ? OpenApiMerger.merge(spec, loadSpec(overrideSpecLocation)) : spec;
5453
}
5554

5655
protected OpenAPI loadSpecFromAnnotations(OpenAPI mergeInto, List<String> resourcePackages, List<String> resourceClasses) {
@@ -66,7 +65,7 @@ protected OpenAPI loadSpecFromAnnotations(OpenAPI mergeInto, List<String> resour
6665
config.setResourceClasses(new HashSet<>(resourceClasses));
6766
}
6867

69-
JaxrsAnnotationScanner scanner = new JaxrsAnnotationScanner();
68+
JaxrsAnnotationScanner scanner = new JaxrsAnnotationScanner<>();
7069
scanner.setConfiguration(config);
7170

7271
Reader reader = new Reader();

0 commit comments

Comments
 (0)