Skip to content

Commit bb422f6

Browse files
melistikmelistik
committed
fix: flexibilized overwrite and fixed native convert (missing ignore-case)
1 parent 1f8668f commit bb422f6

File tree

7 files changed

+46
-46
lines changed

7 files changed

+46
-46
lines changed

‎commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/DefaultOpenApiConverter.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,64 +13,64 @@
1313

1414
@SuppressWarnings({"rawtypes", "unchecked"})
1515
public class DefaultOpenApiConverter implements OpenApiConverter {
16-
private static final Set<String> COLLECTION_TYPES = Set.of(
16+
protected static final Set<String> COLLECTION_TYPES = Set.of(
1717
"java.util.List", "java.util.ArrayList", "java.util.LinkedList",
1818
"java.util.Set", "java.util.HashSet", "java.util.LinkedHashSet", "java.util.SortedSet", "java.util.TreeSet",
1919
"java.util.Collection", "java.lang.Iterable",
2020
"java.util.Queue", "java.util.Deque", "java.util.ArrayDeque"
2121
);
2222

23-
private static final Set<String> STREAM_TYPES = Set.of(
23+
protected static final Set<String> STREAM_TYPES = Set.of(
2424
"java.util.stream.Stream"
2525
);
2626

27-
private static final Set<String> OPTIONAL_TYPES = Set.of(
27+
protected static final Set<String> OPTIONAL_TYPES = Set.of(
2828
"java.util.Optional", "java.util.OptionalInt", "java.util.OptionalLong", "java.util.OptionalDouble"
2929
);
3030

31-
private static final Set<String> FUTURE_TYPES = Set.of(
31+
protected static final Set<String> FUTURE_TYPES = Set.of(
3232
"java.util.concurrent.CompletableFuture", "java.util.concurrent.Future"
3333
);
3434

35-
private static final Set<String> MAP_TYPES = Set.of(
35+
protected static final Set<String> MAP_TYPES = Set.of(
3636
"java.util.Map", "java.util.HashMap", "java.util.LinkedHashMap",
3737
"java.util.SortedMap", "java.util.TreeMap"
3838
);
3939

40-
private boolean startsWithAny(String type, Set<String> prefixes) {
40+
protected boolean startsWithAny(String type, Set<String> prefixes) {
4141
for (String p : prefixes) {
4242
if (type.startsWith(p)) return true;
4343
}
4444
return false;
4545
}
4646

47-
private boolean isCollectionType(String type) {
47+
protected boolean isCollectionType(String type) {
4848
return startsWithAny(type, COLLECTION_TYPES);
4949
}
5050

51-
private boolean isStreamType(String type) {
51+
protected boolean isStreamType(String type) {
5252
return startsWithAny(type, STREAM_TYPES);
5353
}
5454

55-
private boolean isOptionalType(String type) {
55+
protected boolean isOptionalType(String type) {
5656
return startsWithAny(type, OPTIONAL_TYPES);
5757
}
5858

59-
private boolean isFutureType(String type) {
59+
protected boolean isFutureType(String type) {
6060
return startsWithAny(type, FUTURE_TYPES);
6161
}
6262

63-
private boolean isMapType(String type) {
63+
protected boolean isMapType(String type) {
6464
return startsWithAny(type, MAP_TYPES);
6565
}
6666

67-
private static final String PAGEABLE_FQN = "io.rocketbase.commons.dto.PageableResult";
67+
protected static final String PAGEABLE_FQN = "io.rocketbase.commons.dto.PageableResult";
6868

69-
private boolean isPageable(String type) {
69+
protected boolean isPageable(String type) {
7070
return type.startsWith(PAGEABLE_FQN) || type.startsWith("PageableResult");
7171
}
7272

73-
private List<String> splitTopLevelGenerics(String typeWithGenerics) {
73+
protected List<String> splitTopLevelGenerics(String typeWithGenerics) {
7474
int lt = typeWithGenerics.indexOf('<');
7575
int gt = typeWithGenerics.lastIndexOf('>');
7676
if (lt < 0 || gt < 0 || gt < lt) return List.of();
@@ -98,7 +98,7 @@ private List<String> splitTopLevelGenerics(String typeWithGenerics) {
9898
return parts;
9999
}
100100

101-
private String normalizeWildcard(String t) {
101+
protected String normalizeWildcard(String t) {
102102
// "? extends X" / "? super X" → "X", "?" → "any"
103103
String s = t.trim();
104104
if (s.equals("?")) return "any";
@@ -107,7 +107,7 @@ private String normalizeWildcard(String t) {
107107
return s.trim();
108108
}
109109

110-
private String toTsKeyType(String javaKeyTypeRaw) {
110+
protected String toTsKeyType(String javaKeyTypeRaw) {
111111
String t = normalizeWildcard(javaKeyTypeRaw);
112112
String simple = removePackage(t);
113113

@@ -262,7 +262,7 @@ protected String convertType(String type) {
262262
if (getNativeTypes().contains(type.toLowerCase())) type = type.toLowerCase();
263263
if ("Void".equalsIgnoreCase(type)) type = "void";
264264

265-
if (Set.of("Integer", "Long", "Double", "Float", "Short", "BigDecimal", "BigInteger").contains(type)) {
265+
if (Set.of("integer", "long", "double", "float", "short", "bigdecimal", "biginteger").contains(type.toLowerCase())) {
266266
type = "number";
267267
}
268268
if ("Boolean".equalsIgnoreCase(type)) type = "boolean";

‎commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiClientCreatorService.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
@RequiredArgsConstructor
3737
public class OpenApiClientCreatorService {
3838

39-
private final SpringDataWebProperties springDataWebProperties;
40-
private final OpenApiGeneratorProperties openApiGeneratorProperties;
41-
private final OpenApiWebMvcResource openApiWebMvcResource;
42-
private final OpenApiConverter typescriptConverter;
43-
private final InfiniteOptionsTemplateBuilder templateBuilder;
39+
protected final SpringDataWebProperties springDataWebProperties;
40+
protected final OpenApiGeneratorProperties openApiGeneratorProperties;
41+
protected final OpenApiWebMvcResource openApiWebMvcResource;
42+
protected final OpenApiConverter typescriptConverter;
43+
protected final InfiniteOptionsTemplateBuilder templateBuilder;
4444

45-
private Map<String, PebbleTemplate> compiledTemplateMap = new HashMap<>();
45+
protected Map<String, PebbleTemplate> compiledTemplateMap = new HashMap<>();
4646

4747
@SneakyThrows
4848
public List<OpenApiController> getControllers(HttpServletRequest request) {
@@ -91,7 +91,7 @@ public void getTypescriptClients(ReactQueryVersion reactQueryVersion, HttpServle
9191
}
9292
}
9393

94-
private void generateModels(ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
94+
protected void generateModels(ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
9595
Writer writer;
9696
zippedOut.putNextEntry(new ZipEntry("src/model/"));
9797

@@ -108,7 +108,7 @@ private void generateModels(ZipOutputStream zippedOut, Map<String, Object> conte
108108
zippedOut.closeEntry();
109109
}
110110

111-
private void generateIndexAndPackageJson(ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
111+
protected void generateIndexAndPackageJson(ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
112112
Writer writer;
113113
zippedOut.putNextEntry(new ZipEntry("src/"));
114114

@@ -132,7 +132,7 @@ private void generateIndexAndPackageJson(ZipOutputStream zippedOut, Map<String,
132132
zippedOut.closeEntry();
133133
}
134134

135-
private void generateClients(List<OpenApiController> controllers, ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
135+
protected void generateClients(List<OpenApiController> controllers, ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
136136
Writer writer;
137137
zippedOut.putNextEntry(new ZipEntry("src/" + openApiGeneratorProperties.getClientFolder() + "/"));
138138
for (OpenApiController c : controllers) {
@@ -152,7 +152,7 @@ private void generateClients(List<OpenApiController> controllers, ZipOutputStrea
152152
zippedOut.closeEntry();
153153
}
154154

155-
private void generateHooks(ReactQueryVersion reactQueryVersion, List<OpenApiController> controllers, ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
155+
protected void generateHooks(ReactQueryVersion reactQueryVersion, List<OpenApiController> controllers, ZipOutputStream zippedOut, Map<String, Object> context) throws IOException {
156156
Writer writer;
157157
zippedOut.putNextEntry(new ZipEntry("src/" + openApiGeneratorProperties.getHookFolder() + "/"));
158158
for (OpenApiController c : controllers) {

‎commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiControllerMethodExtraction.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public class OpenApiControllerMethodExtraction {
4949
@NoArgsConstructor
5050
@Builder
5151
public static class ExtractorConfig {
52-
private Set<String> pageableParams;
53-
private OpenApiConverter typescriptConverter;
54-
private PathItem.HttpMethod httpMethod;
55-
private String path;
56-
private Operation operation;
57-
private Integer defaultStaleTime;
52+
protected Set<String> pageableParams;
53+
protected OpenApiConverter typescriptConverter;
54+
protected PathItem.HttpMethod httpMethod;
55+
protected String path;
56+
protected Operation operation;
57+
protected Integer defaultStaleTime;
5858
}
5959

6060
public String getHookType() {

‎commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/OpenApiCustomExtractor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) {
102102
return operation;
103103
}
104104

105-
private ClientModuleParams extractControllerBean(HandlerMethod handlerMethod) {
105+
protected ClientModuleParams extractControllerBean(HandlerMethod handlerMethod) {
106106
ClientModuleParams result = new ClientModuleParams(handlerMethod.getBeanType().getName(), false);
107107
if (handlerMethod.getBeanType().isAnnotationPresent(ClientModule.class)) {
108108
ClientModule annotation = handlerMethod.getBeanType().getAnnotation(ClientModule.class);
@@ -118,8 +118,8 @@ private ClientModuleParams extractControllerBean(HandlerMethod handlerMethod) {
118118
@AllArgsConstructor
119119
@NoArgsConstructor
120120
protected static class ClientModuleParams {
121-
private String name;
122-
private boolean disabled;
121+
protected String name;
122+
protected boolean disabled;
123123
}
124124

125125
protected String extractMethodName(String configuredValue, HandlerMethod handlerMethod) {

‎commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/model/ImportGroup.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
@Builder
1515
public class ImportGroup implements Serializable {
1616

17-
private String name;
17+
protected String name;
1818

19-
private Set<String> types;
19+
protected Set<String> types;
2020

2121
}

‎commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/model/OpenApiController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
@NoArgsConstructor
1616
public class OpenApiController implements Serializable {
1717

18-
private String controllerBean;
19-
private List<OpenApiControllerMethodExtraction> methods;
18+
protected String controllerBean;
19+
protected List<OpenApiControllerMethodExtraction> methods;
2020

21-
private OpenApiConverter openApiConverter;
21+
protected OpenApiConverter openApiConverter;
2222

2323
public String getShortName() {
2424
return controllerBean.substring(controllerBean.lastIndexOf(".") + 1).replace("Controller", "");

‎commons-rest-openapi/src/main/java/io/rocketbase/commons/openapi/model/TypescriptApiField.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
@Builder
1414
public class TypescriptApiField implements Serializable {
1515

16-
private String name;
16+
protected String name;
1717

18-
private boolean required;
18+
protected boolean required;
1919

20-
private String type;
20+
protected String type;
2121

22-
private boolean inPath;
22+
protected boolean inPath;
2323

24-
private String description;
24+
protected String description;
2525
}

0 commit comments

Comments
 (0)