Skip to content

Commit afc7c2d

Browse files
committed
Moved the reusable infrastructure to springfox-core
related to #9
1 parent a67f030 commit afc7c2d

File tree

11 files changed

+9
-111
lines changed

11 files changed

+9
-111
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import org.springframework.context.annotation.Bean
77
import org.springframework.context.annotation.Import
88
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
99
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
10-
import springfox.documentation.grails.AlternateTypeRuleConvention
1110
import springfox.documentation.grails.DefaultGrailsPropertySelector
1211
import springfox.documentation.grails.DefaultGrailsPropertyTransformer
1312
import springfox.documentation.grails.DefaultGeneratedClassNamingStrategy
@@ -16,6 +15,7 @@ import springfox.documentation.grails.GrailsPropertyTransformer
1615
import springfox.documentation.grails.GeneratedClassNamingStrategy
1716
import springfox.documentation.grails.SpringfoxGrailsIntegrationConfiguration
1817
import springfox.documentation.schema.AlternateTypeRule
18+
import springfox.documentation.schema.AlternateTypeRuleConvention
1919
import springfox.documentation.spi.DocumentationType
2020
import springfox.documentation.spring.web.plugins.Docket
2121
import springfox.documentation.swagger2.annotations.EnableSwagger2

springfox-grails/src/main/java/springfox/documentation/grails/AlternateTypeBuilder.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

springfox-grails/src/main/java/springfox/documentation/grails/AlternateTypePropertyBuilder.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

springfox-grails/src/main/java/springfox/documentation/grails/AlternateTypeRuleConvention.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

springfox-grails/src/main/java/springfox/documentation/grails/DefaultGrailsAlternateTypeRuleConvention.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.springframework.core.Ordered;
1010
import org.springframework.stereotype.Component;
1111
import springfox.documentation.schema.AlternateTypeRule;
12+
import springfox.documentation.schema.AlternateTypeRuleConvention;
1213

1314
import java.util.Arrays;
1415
import java.util.List;

springfox-grails/src/main/java/springfox/documentation/grails/DefaultGrailsPropertyTransformer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package springfox.documentation.grails;
22

33
import grails.core.GrailsDomainClassProperty;
4+
import springfox.documentation.builders.AlternateTypePropertyBuilder;
45

56
public class DefaultGrailsPropertyTransformer implements GrailsPropertyTransformer {
67
@Override

springfox-grails/src/main/java/springfox/documentation/grails/GrailsPropertyTransformer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.google.common.base.Function;
44
import grails.core.GrailsDomainClassProperty;
5+
import springfox.documentation.builders.AlternateTypePropertyBuilder;
56

67
public interface GrailsPropertyTransformer
78
extends Function<GrailsDomainClassProperty, AlternateTypePropertyBuilder> {

springfox-grails/src/main/java/springfox/documentation/grails/GrailsRequestHandlerProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.beans.factory.annotation.Autowired;
99
import org.springframework.stereotype.Component;
1010
import springfox.documentation.RequestHandler;
11-
import springfox.documentation.schema.AlternateTypeRule;
1211
import springfox.documentation.spi.service.RequestHandlerProvider;
1312

1413
import java.util.Arrays;
@@ -22,18 +21,15 @@ class GrailsRequestHandlerProvider implements RequestHandlerProvider {
2221
private final GrailsActionAttributes urlProvider;
2322
private final GrailsApplication grailsApplication;
2423
private final ActionSpecificationResolver actionResolver;
25-
private final AlternateTypeRuleConvention convention;
2624

2725
@Autowired
2826
public GrailsRequestHandlerProvider(
2927
GrailsApplication grailsApplication,
3028
GrailsActionAttributes urlProvider,
31-
ActionSpecificationResolver actionResolver,
32-
AlternateTypeRuleConvention convention) {
29+
ActionSpecificationResolver actionResolver) {
3330
this.urlProvider = urlProvider;
3431
this.grailsApplication = grailsApplication;
3532
this.actionResolver = actionResolver;
36-
this.convention = convention;
3733
}
3834

3935
@Override

springfox-grails/src/main/java/springfox/documentation/grails/GrailsSerializationTypeGenerator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import grails.core.GrailsDomainClass;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.stereotype.Component;
8+
import springfox.documentation.builders.AlternateTypeBuilder;
9+
import springfox.documentation.builders.AlternateTypePropertyBuilder;
810

911
import static com.google.common.collect.Lists.*;
1012

springfox-grails/src/test/groovy/springfox/documentation/grails/GrailsRequestHandlerProviderSpec.groovy

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,8 @@ class GrailsRequestHandlerProviderSpec extends Specification {
2121
attributes,
2222
new ActionSpecificationResolver(
2323
new RestfulActionSpecificationFactory(resolver),
24-
new MethodBackedActionSpecificationFactory(resolver, attributes)
25-
),
26-
new DefaultGrailsAlternateTypeRuleConvention(resolver, application,
27-
new GrailsSerializationTypeGenerator(
28-
new DefaultGrailsPropertySelector(),
29-
new DefaultGrailsPropertyTransformer(),
30-
new DefaultGeneratedClassNamingStrategy())
31-
)
32-
)
24+
new MethodBackedActionSpecificationFactory(resolver, attributes))
25+
)
3326
expect:
3427
sut.requestHandlers().size() == 1
3528
}

0 commit comments

Comments
 (0)