Skip to content

Commit d521fc0

Browse files
committed
Restored it back to shared conditional beans
The reason it was broken is that the changes in springfox were not in bintray/artifactory yet.
1 parent c29d827 commit d521fc0

File tree

2 files changed

+21
-32
lines changed

2 files changed

+21
-32
lines changed

springfox-grails-contract-tests/grails-app/init/grails/springfox/sample/Application.groovy

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,11 @@ package grails.springfox.sample
22

33
import grails.boot.GrailsApp
44
import grails.boot.config.GrailsAutoConfiguration
5-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
65
import org.springframework.context.annotation.Bean
76
import org.springframework.context.annotation.Import
87
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
98
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
10-
import springfox.documentation.grails.DefaultGeneratedClassNamingStrategy
11-
import springfox.documentation.grails.DefaultGrailsPropertySelector
12-
import springfox.documentation.grails.DefaultGrailsPropertyTransformer
13-
import springfox.documentation.grails.GeneratedClassNamingStrategy
14-
import springfox.documentation.grails.GrailsPropertySelector
15-
import springfox.documentation.grails.GrailsPropertyTransformer
169
import springfox.documentation.grails.SpringfoxGrailsIntegrationConfiguration
17-
import springfox.documentation.schema.AlternateTypeRule
18-
import springfox.documentation.schema.AlternateTypeRuleConvention
1910
import springfox.documentation.spi.DocumentationType
2011
import springfox.documentation.spring.web.plugins.Docket
2112
import springfox.documentation.swagger2.annotations.EnableSwagger2
@@ -31,34 +22,12 @@ class Application extends GrailsAutoConfiguration {
3122
}
3223

3324
@Bean
34-
@ConditionalOnMissingBean(GrailsPropertySelector)
35-
GrailsPropertySelector propertySelector() {
36-
new DefaultGrailsPropertySelector()
37-
}
38-
39-
@Bean
40-
@ConditionalOnMissingBean(GrailsPropertyTransformer)
41-
GrailsPropertyTransformer propertyTransformer() {
42-
new DefaultGrailsPropertyTransformer()
43-
}
44-
45-
@Bean
46-
@ConditionalOnMissingBean(GeneratedClassNamingStrategy)
47-
GeneratedClassNamingStrategy namingStrategy() {
48-
new DefaultGeneratedClassNamingStrategy()
49-
}
50-
51-
@Bean
52-
Docket api(List<AlternateTypeRuleConvention> conventions) {
53-
def typeRules = conventions.collectMany {
54-
it.rules()
55-
}
25+
Docket api() {
5626
new Docket(DocumentationType.SWAGGER_2)
5727
.ignoredParameterTypes(MetaClass)
5828
.select()
5929
.paths(not(ant("/error")))
6030
.build()
61-
.alternateTypeRules(typeRules.toArray(new AlternateTypeRule[typeRules.size()]))
6231
}
6332

6433
@Bean
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
package springfox.documentation.grails;
22

3+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4+
import org.springframework.context.annotation.Bean;
35
import org.springframework.context.annotation.ComponentScan;
46
import org.springframework.context.annotation.Configuration;
57

68
@Configuration
79
@ComponentScan(basePackages = "springfox.documentation.grails")
810
public class SpringfoxGrailsIntegrationConfiguration {
11+
12+
@Bean
13+
@ConditionalOnMissingBean(GrailsPropertySelector.class)
14+
public GrailsPropertySelector propertySelector() {
15+
return new DefaultGrailsPropertySelector();
16+
}
17+
18+
@Bean
19+
@ConditionalOnMissingBean(GrailsPropertyTransformer.class)
20+
public GrailsPropertyTransformer propertyTransformer() {
21+
return new DefaultGrailsPropertyTransformer();
22+
}
23+
24+
@Bean
25+
@ConditionalOnMissingBean(GeneratedClassNamingStrategy.class)
26+
public GeneratedClassNamingStrategy namingStrategy() {
27+
return new DefaultGeneratedClassNamingStrategy();
28+
}
929
}

0 commit comments

Comments
 (0)