Skip to content

Commit e90e8ff

Browse files
committed
#367 Follow up for java.lang imports
1 parent ce9372c commit e90e8ff

File tree

2 files changed

+25
-3
lines changed
  • http-generator-core/src

2 files changed

+25
-3
lines changed

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,7 @@ public String full() {
120120

121121
@Override
122122
public Set<String> importTypes() {
123-
return rawType.startsWith("java.lang.")
124-
&& Character.isUpperCase(rawType.charAt(10))
125-
&& rawType.indexOf('.') > -1
123+
return isJavaLangPackage(rawType)
126124
? Set.of()
127125
: Collections.singleton(rawType.replace("[]", ""));
128126
}
@@ -143,6 +141,10 @@ public String mainType() {
143141
}
144142
}
145143

144+
static boolean isJavaLangPackage(String rawType) {
145+
return rawType.startsWith("java.lang.") && Character.isUpperCase(rawType.charAt(10));
146+
}
147+
146148
/**
147149
* Generic type.
148150
*/
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package io.avaje.http.generator.core;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
import static org.junit.jupiter.api.Assertions.*;
6+
7+
class UTypeTest {
8+
9+
@Test
10+
void isJavaLangPackage() {
11+
assertTrue(UType.isJavaLangPackage("java.lang.F"));
12+
assertTrue(UType.isJavaLangPackage("java.lang.Foo"));
13+
}
14+
15+
@Test
16+
void isJavaLangPackage_expect_false() {
17+
assertFalse(UType.isJavaLangPackage("java.lang.other.Foo"));
18+
assertFalse(UType.isJavaLangPackage("not.lang.Foo"));
19+
}
20+
}

0 commit comments

Comments
 (0)