Skip to content

Commit 92f6765

Browse files
committed
Restored the configuration prior to the breaking build
Unable to figure out why the configurations are not working. Possibly a grails issue, weird that it works locally
1 parent ada0ec0 commit 92f6765

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

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

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
package grails.springfox.sample
22

3-
import com.fasterxml.classmate.TypeResolver
43
import grails.boot.GrailsApp
54
import grails.boot.config.GrailsAutoConfiguration
6-
import grails.core.GrailsApplication
5+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
76
import org.springframework.context.annotation.Bean
87
import org.springframework.context.annotation.Import
98
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
109
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
11-
import springfox.documentation.grails.DefaultGrailsAlternateTypeRuleConvention
12-
import springfox.documentation.grails.GrailsSerializationTypeGenerator
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
1316
import springfox.documentation.grails.SpringfoxGrailsIntegrationConfiguration
17+
import springfox.documentation.schema.AlternateTypeRule
18+
import springfox.documentation.schema.AlternateTypeRuleConvention
1419
import springfox.documentation.spi.DocumentationType
1520
import springfox.documentation.spring.web.plugins.Docket
1621
import springfox.documentation.swagger2.annotations.EnableSwagger2
@@ -26,20 +31,34 @@ class Application extends GrailsAutoConfiguration {
2631
}
2732

2833
@Bean
29-
public DefaultGrailsAlternateTypeRuleConvention grailsModelConvention(
30-
TypeResolver resolver,
31-
GrailsApplication grailsApplication,
32-
GrailsSerializationTypeGenerator typeGenerator) {
33-
new DefaultGrailsAlternateTypeRuleConvention(resolver, grailsApplication, typeGenerator)
34+
@ConditionalOnMissingBean(GrailsPropertySelector)
35+
GrailsPropertySelector propertySelector() {
36+
new DefaultGrailsPropertySelector()
3437
}
3538

3639
@Bean
37-
public Docket api() {
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+
}
3856
new Docket(DocumentationType.SWAGGER_2)
3957
.ignoredParameterTypes(MetaClass)
4058
.select()
4159
.paths(not(ant("/error")))
4260
.build()
61+
.alternateTypeRules(typeRules.toArray(new AlternateTypeRule[typeRules.size()]))
4362
}
4463

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

3-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4-
import org.springframework.context.annotation.Bean;
53
import org.springframework.context.annotation.ComponentScan;
64
import org.springframework.context.annotation.Configuration;
75

86
@Configuration
97
@ComponentScan(basePackages = "springfox.documentation.grails")
108
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-
}
299
}

0 commit comments

Comments
 (0)