Skip to content

Commit 563938e

Browse files
committed
Migrated from guava to native java 8 constructs
Now that we’ve moved the re-usable pieces to core, there is no reason to use guava in this library. Also made access modifiers explicit. resolves #9
1 parent afc7c2d commit 563938e

19 files changed

+40
-50
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,27 @@ public ActionSpecification(
3636
this.handlerMethod = handlerMethod;
3737
}
3838

39-
Set<RequestMethod> getSupportedMethods() {
39+
public Set<RequestMethod> getSupportedMethods() {
4040
return supportedMethods;
4141
}
4242

43-
Set<MediaType> getProduces() {
43+
public Set<MediaType> getProduces() {
4444
return produces;
4545
}
4646

47-
Set<MediaType> getConsumes() {
47+
public Set<MediaType> getConsumes() {
4848
return consumes;
4949
}
5050

51-
List<ResolvedMethodParameter> getParameters() {
51+
public List<ResolvedMethodParameter> getParameters() {
5252
return parameters;
5353
}
5454

55-
ResolvedType getReturnType() {
55+
public ResolvedType getReturnType() {
5656
return returnType;
5757
}
5858

59-
HandlerMethod getHandlerMethod() {
59+
public HandlerMethod getHandlerMethod() {
6060
return handlerMethod;
6161
}
6262
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public ActionSpecificationResolver(
1616
this.methodBackedActions = methodBackedActions;
1717
}
1818

19-
ActionSpecification resolve(GrailsActionContext context) {
19+
public ActionSpecification resolve(GrailsActionContext context) {
2020
if (isRestfulController(context)) {
2121
return restfulActions.create(context);
2222
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private Actions() {
3232
throw new UnsupportedOperationException();
3333
}
3434

35-
static Map<String, HandlerMethod> actionsToHandler(Class grailsController) {
35+
public static Map<String, HandlerMethod> actionsToHandler(Class grailsController) {
3636
Map<String, HandlerMethod> handlerLookup = new HashMap<>();
3737
Class superClass = grailsController;
3838
while (superClass != Object.class && superClass != GroovyObject.class) {
@@ -46,7 +46,7 @@ static Map<String, HandlerMethod> actionsToHandler(Class grailsController) {
4646
return handlerLookup;
4747
}
4848

49-
static Set<RequestMethod> methodOverrides(
49+
public static Set<RequestMethod> methodOverrides(
5050
GrailsActionContext context,
5151
Set<RequestMethod> defaultMethods) {
5252
Set<RequestMethod> methods = new HashSet<>();
@@ -68,11 +68,11 @@ static Set<RequestMethod> methodOverrides(
6868
return methods;
6969
}
7070

71-
static Set<RequestMethod> methodOverrides(GrailsActionContext context) {
71+
public static Set<RequestMethod> methodOverrides(GrailsActionContext context) {
7272
return methodOverrides(context, newHashSet());
7373
}
7474

75-
static Set<MediaType> producesOverrides(GrailsActionContext context) {
75+
public static Set<MediaType> producesOverrides(GrailsActionContext context) {
7676
Set<MediaType> produces = newHashSet(MediaType.APPLICATION_JSON);
7777
List<String> responseFormats;
7878
try {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class CreateActionSpecificationFactory implements ActionSpecificationFactory {
1717
private final TypeResolver resolver;
1818

19-
CreateActionSpecificationFactory(TypeResolver resolver) {
19+
public CreateActionSpecificationFactory(TypeResolver resolver) {
2020
this.resolver = resolver;
2121
}
2222

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

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

33
import com.fasterxml.classmate.TypeResolver;
4-
import com.google.common.base.Function;
5-
import com.google.common.collect.FluentIterable;
64
import grails.core.GrailsApplication;
75
import grails.core.GrailsDomainClass;
86
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +11,7 @@
1311

1412
import java.util.Arrays;
1513
import java.util.List;
14+
import java.util.stream.Collectors;
1615

1716
import static springfox.documentation.schema.AlternateTypeRules.*;
1817

@@ -28,29 +27,20 @@ public DefaultGrailsAlternateTypeRuleConvention(
2827
TypeResolver resolver,
2928
GrailsApplication application,
3029
GrailsSerializationTypeGenerator typeGenerator) {
31-
30+
3231
this.resolver = resolver;
3332
this.application = application;
3433
this.typeGenerator = typeGenerator;
3534
}
3635

3736
@Override
3837
public List<AlternateTypeRule> rules() {
39-
return FluentIterable.from(Arrays.asList(application.getArtefacts("Domain")))
40-
.filter(GrailsDomainClass.class)
41-
.transform(toAlternateTypeRule())
42-
.toList();
43-
}
44-
45-
private Function<GrailsDomainClass, AlternateTypeRule> toAlternateTypeRule() {
46-
return new Function<GrailsDomainClass, AlternateTypeRule>() {
47-
@Override
48-
public AlternateTypeRule apply(GrailsDomainClass domain) {
49-
return newRule(
38+
return Arrays.stream(application.getArtefacts("Domain"))
39+
.filter(GrailsDomainClass.class::isInstance)
40+
.map(domain -> newRule(
5041
domain.getClazz(),
51-
resolver.resolve(typeGenerator.from(domain)), getOrder());
52-
}
53-
};
42+
resolver.resolve(typeGenerator.from((GrailsDomainClass) domain)), getOrder()))
43+
.collect(Collectors.toList());
5444
}
5545

5646
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public class DefaultGrailsPropertySelector implements GrailsPropertySelector {
77
@Override
8-
public boolean apply(GrailsDomainClassProperty each) {
8+
public boolean test(GrailsDomainClassProperty each) {
99
return each.getReferencedDomainClass() == null
1010
&& !Objects.equal(each.getName(), "version");
1111
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class DeleteActionSpecificationFactory implements ActionSpecificationFactory {
1717
private final TypeResolver resolver;
1818

19-
DeleteActionSpecificationFactory(TypeResolver resolver) {
19+
public DeleteActionSpecificationFactory(TypeResolver resolver) {
2020
this.resolver = resolver;
2121
}
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class EditActionSpecificationFactory implements ActionSpecificationFactory {
1717
private final TypeResolver resolver;
1818

19-
EditActionSpecificationFactory(TypeResolver resolver) {
19+
public EditActionSpecificationFactory(TypeResolver resolver) {
2020
this.resolver = resolver;
2121
}
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public GrailsActionAttributes(
2828
this.urlMappings = urlMappings;
2929
}
3030

31-
String actionUrl(GrailsActionContext context, Map<String, String> value) {
31+
public String actionUrl(GrailsActionContext context, Map<String, String> value) {
3232
LinkedHashMap<String, Object> map = new LinkedHashMap<>(2);
3333
map.put("controller", context.getController().getName());
3434
map.put("action", context.getAction());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import grails.core.GrailsControllerClass;
44
import grails.core.GrailsDomainClass;
55

6-
public class GrailsActionContext {
6+
class GrailsActionContext {
77
private final GrailsControllerClass controller;
88
private final GrailsDomainClass domainClass;
99
private final GrailsActionAttributes urlProvider;

0 commit comments

Comments
 (0)