Skip to content

Commit ce9372c

Browse files
authored
Fix Java Lang imports (#367)
* fix java lang imports * actually uppercase
1 parent e145386 commit ce9372c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -472,20 +472,18 @@ public List<? extends TypeMirror> throwsList() {
472472
* arg0, arg1, arg2 etc.
473473
*/
474474
public void checkArgumentNames() {
475-
if (!params.isEmpty() && pathSegments != null) {
476-
if (allArgParamNames()) {
477-
final var namedSegments = namedSegments();
478-
if (params.size() >= namedSegments.size()) {
479-
// path params, take the names from the segments
480-
for (int i = 0; i < namedSegments.size(); i++) {
481-
MethodParam pathParam = params.get(i);
482-
pathParam.overrideVarName(namedSegments.get(i).name(), ParamType.PATHPARAM);
483-
}
484-
// QueryParam and Headers which now require explicit names
485-
for (int i = namedSegments.size(); i < params.size(); i++) {
486-
MethodParam param = params.get(i);
487-
param.overrideVarName(i);
488-
}
475+
if (!params.isEmpty() && pathSegments != null && allArgParamNames()) {
476+
final var namedSegments = namedSegments();
477+
if (params.size() >= namedSegments.size()) {
478+
// path params, take the names from the segments
479+
for (int i = 0; i < namedSegments.size(); i++) {
480+
MethodParam pathParam = params.get(i);
481+
pathParam.overrideVarName(namedSegments.get(i).name(), ParamType.PATHPARAM);
482+
}
483+
// QueryParam and Headers which now require explicit names
484+
for (int i = namedSegments.size(); i < params.size(); i++) {
485+
MethodParam param = params.get(i);
486+
param.overrideVarName(i);
489487
}
490488
}
491489
}

http-generator-core/src/main/java/io/avaje/http/generator/core/UType.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,11 @@ public String full() {
120120

121121
@Override
122122
public Set<String> importTypes() {
123-
return rawType.startsWith("java.lang.") && rawType.indexOf('.') > -1
124-
? Set.of()
125-
: Collections.singleton(rawType.replace("[]", ""));
123+
return rawType.startsWith("java.lang.")
124+
&& Character.isUpperCase(rawType.charAt(10))
125+
&& rawType.indexOf('.') > -1
126+
? Set.of()
127+
: Collections.singleton(rawType.replace("[]", ""));
126128
}
127129

128130
@Override

0 commit comments

Comments
 (0)