Skip to content

Commit f4bd14d

Browse files
liujingxing10000liujingxing10000
committed
RxHttp子类命名方式更改，由之前的RxHttp$XxxParam改为RxHttpXxxParam
1 parent c4d79d7 commit f4bd14d

2 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎rxhttp-compiler/src/main/java/com/rxhttp/compiler/ParamsAnnotatedClass.java‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ public List<MethodSpec> getMethodList(Filer filer) throws IOException {
7171

7272
List<MethodSpec> methodList = new ArrayList<>();
7373
Map<String, String> methodMap = new LinkedHashMap<>();
74-
methodMap.put("get", "RxHttp$NoBodyParam");
75-
methodMap.put("head", "RxHttp$NoBodyParam");
76-
methodMap.put("postForm", "RxHttp$FormParam");
77-
methodMap.put("putForm", "RxHttp$FormParam");
78-
methodMap.put("patchForm", "RxHttp$FormParam");
79-
methodMap.put("deleteForm", "RxHttp$FormParam");
80-
methodMap.put("postJson", "RxHttp$JsonParam");
81-
methodMap.put("putJson", "RxHttp$JsonParam");
82-
methodMap.put("patchJson", "RxHttp$JsonParam");
83-
methodMap.put("deleteJson", "RxHttp$JsonParam");
84-
methodMap.put("postJsonArray", "RxHttp$JsonArrayParam");
85-
methodMap.put("putJsonArray", "RxHttp$JsonArrayParam");
86-
methodMap.put("patchJsonArray", "RxHttp$JsonArrayParam");
87-
methodMap.put("deleteJsonArray", "RxHttp$JsonArrayParam");
74+
methodMap.put("get", "RxHttpNoBodyParam");
75+
methodMap.put("head", "RxHttpNoBodyParam");
76+
methodMap.put("postForm", "RxHttpFormParam");
77+
methodMap.put("putForm", "RxHttpFormParam");
78+
methodMap.put("patchForm", "RxHttpFormParam");
79+
methodMap.put("deleteForm", "RxHttpFormParam");
80+
methodMap.put("postJson", "RxHttpJsonParam");
81+
methodMap.put("putJson", "RxHttpJsonParam");
82+
methodMap.put("patchJson", "RxHttpJsonParam");
83+
methodMap.put("deleteJson", "RxHttpJsonParam");
84+
methodMap.put("postJsonArray", "RxHttpJsonArrayParam");
85+
methodMap.put("putJsonArray", "RxHttpJsonArrayParam");
86+
methodMap.put("patchJsonArray", "RxHttpJsonArrayParam");
87+
methodMap.put("deleteJsonArray", "RxHttpJsonArrayParam");
8888

8989
MethodSpec.Builder method;
9090
for (Map.Entry<String, String> map : methodMap.entrySet()) {
@@ -101,43 +101,43 @@ public List<MethodSpec> getMethodList(Filer filer) throws IOException {
101101
for (Entry<String, TypeElement> item : mElementMap.entrySet()) {
102102
TypeElement typeElement = item.getValue();
103103
ClassName param = ClassName.get(typeElement);
104-
String rxHttpName = "RxHttp$" + typeElement.getSimpleName();
105-
ClassName rxHttp$ParamName = ClassName.get(RxHttpGenerator.packageName, rxHttpName);
104+
String rxHttpName = "RxHttp" + typeElement.getSimpleName();
105+
ClassName RxHttpParamName = ClassName.get(RxHttpGenerator.packageName, rxHttpName);
106106
method = MethodSpec.methodBuilder(item.getKey())
107107
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
108108
.addParameter(String.class, "url")
109109
.addParameter(ArrayTypeName.of(Object.class), "formatArgs")
110110
.varargs()
111-
.addStatement("return new $T(new $T(format(url, formatArgs)))", rxHttp$ParamName, param)
112-
.returns(rxHttp$ParamName);
111+
.addStatement("return new $T(new $T(format(url, formatArgs)))", RxHttpParamName, param)
112+
.returns(RxHttpParamName);
113113
methodList.add(method.build());
114114

115115
TypeMirror superclass = typeElement.getSuperclass();
116-
TypeName rxHttp$Param;
116+
TypeName RxHttpParam;
117117
String prefix = "((" + param.simpleName() + ")param).";
118118
switch (superclass.toString()) {
119119
case "rxhttp.wrapper.param.FormParam":
120-
rxHttp$Param = ClassName.get(RxHttpGenerator.packageName, "RxHttp$FormParam");
120+
RxHttpParam = ClassName.get(RxHttpGenerator.packageName, "RxHttpFormParam");
121121
break;
122122
case "rxhttp.wrapper.param.JsonParam":
123-
rxHttp$Param = ClassName.get(RxHttpGenerator.packageName, "RxHttp$JsonParam");
123+
RxHttpParam = ClassName.get(RxHttpGenerator.packageName, "RxHttpJsonParam");
124124
break;
125125
case "rxhttp.wrapper.param.NoBodyParam":
126-
rxHttp$Param = ClassName.get(RxHttpGenerator.packageName, "RxHttp$NoBodyParam");
126+
RxHttpParam = ClassName.get(RxHttpGenerator.packageName, "RxHttpNoBodyParam");
127127
break;
128128
default:
129129
prefix = "param.";
130-
rxHttp$Param = ParameterizedTypeName.get(RxHttpGenerator.RXHTTP, param, rxHttp$ParamName);
130+
RxHttpParam = ParameterizedTypeName.get(RxHttpGenerator.RXHTTP, param, RxHttpParamName);
131131
break;
132132
}
133133

134-
List<MethodSpec> rxHttp$PostEncryptFormParamMethod = new ArrayList<>();
134+
List<MethodSpec> RxHttpPostEncryptFormParamMethod = new ArrayList<>();
135135

136136
method = MethodSpec.constructorBuilder()
137137
.addModifiers(Modifier.PUBLIC)
138138
.addParameter(param, "param")
139139
.addStatement("super(param)");
140-
rxHttp$PostEncryptFormParamMethod.add(method.build());
140+
RxHttpPostEncryptFormParamMethod.add(method.build());
141141

142142
for (Element enclosedElement : typeElement.getEnclosedElements()) {
143143
if (!(enclosedElement instanceof ExecutableElement)
@@ -148,7 +148,7 @@ public List<MethodSpec> getMethodList(Filer filer) throws IOException {
148148
ExecutableElement methodElement = (ExecutableElement) enclosedElement;
149149
TypeName returnType = TypeName.get(methodElement.getReturnType()); //方法返回值
150150
if (returnType.toString().equals(param.toString())) {
151-
returnType = rxHttp$ParamName;
151+
returnType = RxHttpParamName;
152152
}
153153
List<ParameterSpec> parameterSpecs = new ArrayList<>(); //方法参数
154154
StringBuilder methodBody = new StringBuilder(enclosedElement.getSimpleName().toString()) //方法体
@@ -184,7 +184,7 @@ public List<MethodSpec> getMethodList(Filer filer) throws IOException {
184184
method.varargs();
185185
}
186186

187-
if (returnType == rxHttp$ParamName) {
187+
if (returnType == RxHttpParamName) {
188188
method.addStatement(prefix + methodBody, param)
189189
.addStatement("return this");
190190
} else if (returnType.toString().equals("void")) {
@@ -193,16 +193,16 @@ public List<MethodSpec> getMethodList(Filer filer) throws IOException {
193193
method.addStatement("return " + prefix + methodBody, param);
194194
}
195195
method.returns(returnType);
196-
rxHttp$PostEncryptFormParamMethod.add(method.build());
196+
RxHttpPostEncryptFormParamMethod.add(method.build());
197197
}
198198

199199
TypeSpec rxHttpPostEncryptFormParamSpec = TypeSpec.classBuilder(rxHttpName)
200200
.addJavadoc("Github" +
201201
"\nhttps://github.com/liujingxing/RxHttp" +
202202
"\nhttps://github.com/liujingxing/RxLife\n")
203203
.addModifiers(Modifier.PUBLIC)
204-
.superclass(rxHttp$Param)
205-
.addMethods(rxHttp$PostEncryptFormParamMethod)
204+
.superclass(RxHttpParam)
205+
.addMethods(RxHttpPostEncryptFormParamMethod)
206206
.build();
207207

208208
JavaFile.builder(RxHttpGenerator.packageName, rxHttpPostEncryptFormParamSpec)
@@ -212,29 +212,29 @@ public List<MethodSpec> getMethodList(Filer filer) throws IOException {
212212
method = MethodSpec.methodBuilder("with")
213213
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
214214
.addParameter(noBodyParamName, "noBodyParam")
215-
.addStatement("return new $L(noBodyParam)", "RxHttp$NoBodyParam")
216-
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttp$NoBodyParam"));
215+
.addStatement("return new $L(noBodyParam)", "RxHttpNoBodyParam")
216+
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttpNoBodyParam"));
217217
methodList.add(method.build());
218218

219219
method = MethodSpec.methodBuilder("with")
220220
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
221221
.addParameter(formParamName, "formParam")
222-
.addStatement("return new $L(formParam)", "RxHttp$FormParam")
223-
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttp$FormParam"));
222+
.addStatement("return new $L(formParam)", "RxHttpFormParam")
223+
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttpFormParam"));
224224
methodList.add(method.build());
225225

226226
method = MethodSpec.methodBuilder("with")
227227
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
228228
.addParameter(jsonParamName, "jsonParam")
229-
.addStatement("return new $L(jsonParam)", "RxHttp$JsonParam")
230-
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttp$JsonParam"));
229+
.addStatement("return new $L(jsonParam)", "RxHttpJsonParam")
230+
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttpJsonParam"));
231231
methodList.add(method.build());
232232

233233
method = MethodSpec.methodBuilder("with")
234234
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
235235
.addParameter(jsonArrayParamName, "jsonArrayParam")
236-
.addStatement("return new $L(jsonArrayParam)", "RxHttp$JsonArrayParam")
237-
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttp$JsonArrayParam"));
236+
.addStatement("return new $L(jsonArrayParam)", "RxHttpJsonArrayParam")
237+
.returns(ClassName.get(RxHttpGenerator.packageName, "RxHttpJsonArrayParam"));
238238
methodList.add(method.build());
239239

240240
method = MethodSpec.methodBuilder("setUrl")

‎rxhttp-compiler/src/main/java/com/rxhttp/compiler/RxHttpGenerator.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ public void generateCode(Elements elementUtils, Filer filer, String platform) th
106106
TypeName mapName = ParameterizedTypeName.get(ClassName.get(Map.class), subString, subObject);
107107

108108
ClassName noBodyParamName = ClassName.get(packageName, "NoBodyParam");
109-
ClassName rxHttpNoBodyName = ClassName.get(packageName, "RxHttp$NoBodyParam");
109+
ClassName rxHttpNoBodyName = ClassName.get(packageName, "RxHttpNoBodyParam");
110110
ClassName formParamName = ClassName.get(packageName, "FormParam");
111-
ClassName rxHttpFormName = ClassName.get(packageName, "RxHttp$FormParam");
111+
ClassName rxHttpFormName = ClassName.get(packageName, "RxHttpFormParam");
112112
ClassName jsonParamName = ClassName.get(packageName, "JsonParam");
113-
ClassName rxHttpJsonName = ClassName.get(packageName, "RxHttp$JsonParam");
113+
ClassName rxHttpJsonName = ClassName.get(packageName, "RxHttpJsonParam");
114114
ClassName jsonArrayParamName = ClassName.get(packageName, "JsonArrayParam");
115-
ClassName rxHttpJsonArrayName = ClassName.get(packageName, "RxHttp$JsonArrayParam");
115+
ClassName rxHttpJsonArrayName = ClassName.get(packageName, "RxHttpJsonArrayParam");
116116

117117
TypeName rxHttpNoBody = ParameterizedTypeName.get(RXHTTP, noBodyParamName, rxHttpNoBodyName);
118118
TypeName rxHttpForm = ParameterizedTypeName.get(RXHTTP, formParamName, rxHttpFormName);
@@ -355,7 +355,7 @@ public void generateCode(Elements elementUtils, Filer filer, String platform) th
355355
.returns(listObjectName);
356356
methodList.add(method.build());
357357

358-
TypeSpec rxHttpNoBodySpec = TypeSpec.classBuilder("RxHttp$NoBodyParam")
358+
TypeSpec rxHttpNoBodySpec = TypeSpec.classBuilder("RxHttpNoBodyParam")
359359
.addJavadoc("Github" +
360360
"\nhttps://github.com/liujingxing/RxHttp" +
361361
"\nhttps://github.com/liujingxing/RxLife\n")
@@ -588,7 +588,7 @@ public void generateCode(Elements elementUtils, Filer filer, String platform) th
588588
methodList.add(method.build());
589589

590590

591-
TypeSpec rxHttpFormSpec = TypeSpec.classBuilder("RxHttp$FormParam")
591+
TypeSpec rxHttpFormSpec = TypeSpec.classBuilder("RxHttpFormParam")
592592
.addJavadoc("Github" +
593593
"\nhttps://github.com/liujingxing/RxHttp" +
594594
"\nhttps://github.com/liujingxing/RxLife\n")
@@ -665,7 +665,7 @@ public void generateCode(Elements elementUtils, Filer filer, String platform) th
665665
.returns(rxHttpJsonName);
666666
methodList.add(method.build());
667667

668-
TypeSpec rxHttpJsonSpec = TypeSpec.classBuilder("RxHttp$JsonParam")
668+
TypeSpec rxHttpJsonSpec = TypeSpec.classBuilder("RxHttpJsonParam")
669669
.addJavadoc("Github" +
670670
"\nhttps://github.com/liujingxing/RxHttp" +
671671
"\nhttps://github.com/liujingxing/RxLife\n")
@@ -773,7 +773,7 @@ public void generateCode(Elements elementUtils, Filer filer, String platform) th
773773
.returns(rxHttpJsonArrayName);
774774
methodList.add(method.build());
775775

776-
TypeSpec rxHttpJsonArraySpec = TypeSpec.classBuilder("RxHttp$JsonArrayParam")
776+
TypeSpec rxHttpJsonArraySpec = TypeSpec.classBuilder("RxHttpJsonArrayParam")
777777
.addJavadoc("Github" +
778778
"\nhttps://github.com/liujingxing/RxHttp" +
779779
"\nhttps://github.com/liujingxing/RxLife\n")

0 commit comments

Comments
 (0)