Skip to content

Commit 1e8f86d

Browse files
imeszarosimeszaros
committed
Change requests.
1 parent c7c8550 commit 1e8f86d

File tree

5 files changed

+26
-18
lines changed

5 files changed

+26
-18
lines changed

‎jooby/src/main/java/io/jooby/annotations/Param.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* The order of {@link ParamSource}s defines the search priority.
1919
*
2020
* <pre>{@code
21-
* public String search(&#64;Param(sources = { ParamSource.QUERY, ParamSource.PATH }) String q) {
21+
* public String search(&#64;Param({ ParamSource.QUERY, ParamSource.PATH }) String q) {
2222
* ...
2323
* }
2424
* }</pre>
@@ -32,12 +32,12 @@
3232
*
3333
* @return Parameter name.
3434
*/
35-
String value() default "";
35+
String name() default "";
3636

3737
/**
3838
* Parameter sources to search in, the order defines the search priority.
3939
*
4040
* @return Parameter sources to search in.
4141
*/
42-
ParamSource[] sources();
42+
ParamSource[] value();
4343
}

‎modules/jooby-apt/src/main/java/io/jooby/apt/Annotations.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ public interface Annotations {
138138
/**
139139
* Parameter lookup.
140140
*/
141-
Set<String> PARAM_LOOKUP = unmodifiableSet(new LinkedHashSet<>(asList(
141+
Set<String> PARAM_LOOKUP = unmodifiableSet(Collections.singleton(
142142
Param.class.getName()
143-
)));
143+
));
144144

145145
/**
146146
* Produces parameters.

‎modules/jooby-apt/src/main/java/io/jooby/internal/apt/ParamDefinition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public boolean isSimpleType() {
137137

138138
public String[] sources() {
139139
return annotations(parameter.getAnnotationMirrors(), this.kind.annotations()).stream()
140-
.flatMap(it -> Annotations.attribute(it, "sources", v ->
140+
.flatMap(it -> Annotations.attribute(it, "value", v ->
141141
((VariableElement) v.getValue()).getSimpleName().toString()).stream())
142142

143143
.toArray(String[]::new);
@@ -311,7 +311,7 @@ private List<AnnotationMirror> annotations(List<? extends AnnotationMirror> anno
311311

312312
private String parameterName(VariableElement parameter, Set<String> types) {
313313
return annotations(parameter.getAnnotationMirrors(), types).stream()
314-
.flatMap(it -> Annotations.attribute(it, "value").stream())
314+
.flatMap(it -> Annotations.attribute(it, kind.httpNameMemberName()).stream())
315315
.findFirst()
316316
.orElse(parameter.getSimpleName().toString());
317317
}

‎modules/jooby-apt/src/main/java/io/jooby/internal/apt/ParamKind.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@ public enum ParamKind {
196196
@Override public ParamWriter newWriter() {
197197
return new ParamLookupWriter();
198198
}
199+
200+
@Override public String httpNameMemberName() {
201+
return "name";
202+
}
199203
},
200204

201205
ROUTE_PARAM {
@@ -234,6 +238,10 @@ public Method singleValue(ParamDefinition param) throws NoSuchMethodException {
234238
throw new UnsupportedOperationException("No single value method for: '" + param + "'");
235239
}
236240

241+
public String httpNameMemberName() {
242+
return "value";
243+
}
244+
237245
public static ParamKind forTypeInjection(ParamDefinition param) {
238246
TypeMirror type = param.isOptional() ?
239247
param.getType().getArguments().get(0).getRawType() :

‎modules/jooby-apt/src/test/java/source/RouteWithParamLookup.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,57 @@
1616
public class RouteWithParamLookup {
1717

1818
@GET("/lookup/no-sources")
19-
public String lookupNoSources(@Param(sources = {}) int myParam) {
19+
public String lookupNoSources(@Param({}) int myParam) {
2020
return String.valueOf(myParam);
2121
}
2222

2323
@GET("/lookup/source-num-1")
24-
public String lookupSourceNum1(@Nullable @Param(sources = { PATH }) String myParam) {
24+
public String lookupSourceNum1(@Nullable @Param({ PATH }) String myParam) {
2525
return String.valueOf(myParam);
2626
}
2727

2828
@GET("/lookup/source-num-2")
29-
public String lookupSourceNum2(@Nullable @Param(sources = { PATH, HEADER }) String myParam) {
29+
public String lookupSourceNum2(@Nullable @Param({ PATH, HEADER }) String myParam) {
3030
return String.valueOf(myParam);
3131
}
3232

3333
@GET("/lookup/source-num-3")
34-
public String lookupSourceNum3(@Nullable @Param(sources = { PATH, HEADER, COOKIE }) String myParam) {
34+
public String lookupSourceNum3(@Nullable @Param({ PATH, HEADER, COOKIE }) String myParam) {
3535
return String.valueOf(myParam);
3636
}
3737

3838
@GET("/lookup/source-num-4")
39-
public String lookupSourceNum4(@Nullable @Param(sources = { PATH, HEADER, COOKIE, FLASH }) String myParam) {
39+
public String lookupSourceNum4(@Nullable @Param({ PATH, HEADER, COOKIE, FLASH }) String myParam) {
4040
return String.valueOf(myParam);
4141
}
4242

4343
@GET("/lookup/source-num-5")
44-
public String lookupSourceNum5(@Nullable @Param(sources = { PATH, HEADER, COOKIE, FLASH, SESSION }) String myParam) {
44+
public String lookupSourceNum5(@Nullable @Param({ PATH, HEADER, COOKIE, FLASH, SESSION }) String myParam) {
4545
return String.valueOf(myParam);
4646
}
4747

4848
@GET("/lookup/source-num-6")
49-
public String lookupSourceNum6(@Nullable @Param(sources = { PATH, HEADER, COOKIE, FLASH, SESSION, QUERY }) String myParam) {
49+
public String lookupSourceNum6(@Nullable @Param({ PATH, HEADER, COOKIE, FLASH, SESSION, QUERY }) String myParam) {
5050
return String.valueOf(myParam);
5151
}
5252

5353
@GET("/lookup/source-num-6plus")
54-
public String lookupSourceNum6plus(@Nullable @Param(sources = { PATH, HEADER, COOKIE, FLASH, SESSION, QUERY, FORM }) String myParam) {
54+
public String lookupSourceNum6plus(@Nullable @Param({ PATH, HEADER, COOKIE, FLASH, SESSION, QUERY, FORM }) String myParam) {
5555
return String.valueOf(myParam);
5656
}
5757

5858
@GET("/lookup/query-path/{myParam}")
59-
public String lookupQueryPath(@Param(sources = { QUERY, PATH }) int myParam) {
59+
public String lookupQueryPath(@Param({ QUERY, PATH }) int myParam) {
6060
return String.valueOf(myParam);
6161
}
6262

6363
@GET("/lookup/path-query/{myParam}")
64-
public String lookupPathQuery(@Param(sources = { PATH, QUERY }) int myParam) {
64+
public String lookupPathQuery(@Param({ PATH, QUERY }) int myParam) {
6565
return String.valueOf(myParam);
6666
}
6767

6868
@GET("/lookup/missing")
69-
public String lookupMissing(@Param(sources = { PATH, QUERY }) String myParam) {
69+
public String lookupMissing(@Param({ PATH, QUERY }) String myParam) {
7070
return String.valueOf(myParam);
7171
}
7272
}

0 commit comments

Comments
 (0)