Skip to content

Commit 0b9ffa5

Browse files
vegegokuvegegoku
committed
Merge branch 'release/1.0.0-RC6'
2 parents cec7913 + 5277eb6 commit 0b9ffa5

File tree

9 files changed

+141
-132
lines changed

9 files changed

+141
-132
lines changed

‎domino-rest-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC5</version>
8+
<version>1.0.0-RC6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎domino-rest-client/src/main/java/org/dominokit/rest/js/DominoSimpleEventsBus.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ public void addEvent(Event.Type<EventProcessor> type) {
5151
/** {@inheritDoc} */
5252
@Override
5353
public void publishEvent(RequestEvent<Event<EventProcessor>> event) {
54-
try {
55-
simpleGwtEventsBus.fireEvent(event.asEvent());
56-
} catch (Exception ex) {
57-
LOGGER.error("could not publish event", ex);
58-
throw ex;
59-
}
54+
// try {
55+
simpleGwtEventsBus.fireEvent(event.asEvent());
56+
// } catch (Exception ex) {
57+
// LOGGER.error("could not publish event", ex);
58+
// throw ex;
59+
// }
6060
}
6161
}

‎domino-rest-jaxrs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.dominokit</groupId>
77
<artifactId>domino-rest</artifactId>
8-
<version>1.0.0-RC5</version>
8+
<version>1.0.0-RC6</version>
99
</parent>
1010

1111
<artifactId>domino-rest-jaxrs</artifactId>

‎domino-rest-jvm/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC5</version>
8+
<version>1.0.0-RC6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎domino-rest-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>domino-rest</artifactId>
66
<groupId>org.dominokit</groupId>
7-
<version>1.0.0-RC5</version>
7+
<version>1.0.0-RC6</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎domino-rest-processor/src/main/java/org/dominokit/rest/processor/RequestFactorySourceWriter.java‎

Lines changed: 127 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -236,26 +236,15 @@ private MethodSpec makeRequestFactoryMethod(ServiceMethod serviceMethod) {
236236
variableElement -> {
237237
if (variableElement.getAnnotation(Multipart.class) != null) {
238238
// get from object
239-
Element multipartElement = types.asElement(variableElement.asType());
240-
multipartElement.getEnclosedElements().stream()
241-
.filter(element -> element.getKind() == ElementKind.FIELD)
242-
.filter(element -> element.getAnnotation(FormParam.class) != null)
243-
.forEach(
244-
field -> {
245-
addMultipart(
246-
serviceMethod,
247-
request,
248-
(VariableElement) field,
249-
variableElement.getSimpleName().toString()
250-
+ "."
251-
+ fieldOrGetter(multipartElement, field));
252-
});
239+
getFromModel(serviceMethod, request, variableElement);
253240
} else {
254-
addMultipart(
255-
serviceMethod,
256-
request,
257-
variableElement,
258-
variableElement.getSimpleName().toString());
241+
if (!isParamField(variableElement)) {
242+
addMultipart(
243+
serviceMethod,
244+
request,
245+
variableElement,
246+
variableElement.getSimpleName().toString());
247+
}
259248
}
260249
});
261250
request.addStatement(initializeStatement + "(multipartForm)");
@@ -323,6 +312,24 @@ && nonNull(parameter.getAnnotation(DateFormat.class))) {
323312
return request.build();
324313
}
325314

315+
private void getFromModel(
316+
ServiceMethod serviceMethod, MethodSpec.Builder request, VariableElement variableElement) {
317+
Element multipartElement = types.asElement(variableElement.asType());
318+
multipartElement.getEnclosedElements().stream()
319+
.filter(element -> element.getKind() == ElementKind.FIELD)
320+
.filter(element -> element.getAnnotation(FormParam.class) != null)
321+
.forEach(
322+
field -> {
323+
addMultipart(
324+
serviceMethod,
325+
request,
326+
(VariableElement) field,
327+
variableElement.getSimpleName().toString()
328+
+ "."
329+
+ fieldOrGetter(multipartElement, field));
330+
});
331+
}
332+
326333
private TypeName getParameterType(VariableElement parameter) {
327334
if (Type.isPrimitiveArray(parameter.asType())
328335
&& Type.arrayComponentType(parameter.asType()).getKind() == TypeKind.BYTE) {
@@ -339,110 +346,112 @@ private void addMultipart(
339346
FormParam annotation = variableElement.getAnnotation(FormParam.class);
340347
Optional<FileName> fileName =
341348
Optional.ofNullable(variableElement.getAnnotation(FileName.class));
342-
if (isRequestBody(variableElement)) {
343-
Optional<CodeBlock> requestWriter =
344-
getRequestWriter(serviceMethod.method, variableElement.asType(), serviceMethod);
345-
requestWriter.ifPresent(
346-
codeBlock -> {
347-
if (fileName.isPresent()) {
348-
request.addStatement(
349-
"multipartForm.append($S, () -> $L.write($L), $S, $S)",
350-
annotation.value(),
351-
codeBlock,
352-
paramName,
353-
MediaType.APPLICATION_JSON,
354-
fileName.get().value());
355-
} else {
356-
request.addStatement(
357-
"multipartForm.append($S, () -> $L.write($L), $S)",
358-
annotation.value(),
359-
codeBlock,
360-
paramName,
361-
MediaType.APPLICATION_JSON);
362-
}
363-
});
364-
} else if (Type.isPrimitiveArray(variableElement.asType())
365-
&& Type.arrayComponentType(variableElement.asType()).getKind() == TypeKind.BYTE) {
366-
if (variableElement.getKind() == ElementKind.FIELD) {
367-
if (fileName.isPresent()) {
368-
request.addStatement(
369-
"multipartForm.append($S, $L, $S, $S)",
370-
annotation.value(),
371-
paramName,
372-
MediaType.APPLICATION_OCTET_STREAM,
373-
fileName.get().value());
374-
} else {
375-
request.addStatement(
376-
"multipartForm.append($S, $L, $S)",
377-
annotation.value(),
378-
paramName,
379-
MediaType.APPLICATION_OCTET_STREAM);
380-
}
381-
} else {
382-
if (fileName.isPresent()) {
383-
request.addStatement(
384-
"multipartForm.append($S, $L.getData(), $S, $S)",
385-
annotation.value(),
386-
paramName,
387-
MediaType.APPLICATION_OCTET_STREAM,
388-
fileName.get().value());
349+
if (nonNull(annotation)) {
350+
if (isRequestBody(variableElement)) {
351+
Optional<CodeBlock> requestWriter =
352+
getRequestWriter(serviceMethod.method, variableElement.asType(), serviceMethod);
353+
requestWriter.ifPresent(
354+
codeBlock -> {
355+
if (fileName.isPresent()) {
356+
request.addStatement(
357+
"multipartForm.append($S, () -> $L.write($L), $S, $S)",
358+
annotation.value(),
359+
codeBlock,
360+
paramName,
361+
MediaType.APPLICATION_JSON,
362+
fileName.get().value());
363+
} else {
364+
request.addStatement(
365+
"multipartForm.append($S, () -> $L.write($L), $S)",
366+
annotation.value(),
367+
codeBlock,
368+
paramName,
369+
MediaType.APPLICATION_JSON);
370+
}
371+
});
372+
} else if (Type.isPrimitiveArray(variableElement.asType())
373+
&& Type.arrayComponentType(variableElement.asType()).getKind() == TypeKind.BYTE) {
374+
if (variableElement.getKind() == ElementKind.FIELD) {
375+
if (fileName.isPresent()) {
376+
request.addStatement(
377+
"multipartForm.append($S, $L, $S, $S)",
378+
annotation.value(),
379+
paramName,
380+
MediaType.APPLICATION_OCTET_STREAM,
381+
fileName.get().value());
382+
} else {
383+
request.addStatement(
384+
"multipartForm.append($S, $L, $S)",
385+
annotation.value(),
386+
paramName,
387+
MediaType.APPLICATION_OCTET_STREAM);
388+
}
389389
} else {
390-
request.addStatement(
391-
"multipartForm.append($S, $L.getData(), $S, $L.getFileName())",
392-
annotation.value(),
393-
paramName,
394-
MediaType.APPLICATION_OCTET_STREAM,
395-
paramName);
390+
if (fileName.isPresent()) {
391+
request.addStatement(
392+
"multipartForm.append($S, $L.getData(), $S, $S)",
393+
annotation.value(),
394+
paramName,
395+
MediaType.APPLICATION_OCTET_STREAM,
396+
fileName.get().value());
397+
} else {
398+
request.addStatement(
399+
"multipartForm.append($S, $L.getData(), $S, $L.getFileName())",
400+
annotation.value(),
401+
paramName,
402+
MediaType.APPLICATION_OCTET_STREAM,
403+
paramName);
404+
}
396405
}
397-
}
398406

399-
} else {
400-
if (processorUtil.isStringType(variableElement.asType())) {
401-
if (fileName.isPresent()) {
402-
request.addStatement(
403-
"multipartForm.append($S, () -> $L, $S, $S)",
404-
annotation.value(),
405-
paramName,
406-
MediaType.TEXT_PLAIN,
407-
fileName.get().value());
408-
} else {
409-
request.addStatement(
410-
"multipartForm.append($S, () -> $L, $S)",
411-
annotation.value(),
412-
paramName,
413-
MediaType.TEXT_PLAIN);
414-
}
415-
} else if (processorUtil.isPrimitive(variableElement.asType())) {
416-
if (fileName.isPresent()) {
417-
request.addStatement(
418-
"multipartForm.append($S, () -> $T.valueOf($L), $S, $S)",
419-
annotation.value(),
420-
String.class,
421-
paramName,
422-
MediaType.TEXT_PLAIN,
423-
fileName.get().value());
424-
} else {
425-
request.addStatement(
426-
"multipartForm.append($S, () -> $T.valueOf($L), $S)",
427-
annotation.value(),
428-
String.class,
429-
paramName,
430-
MediaType.TEXT_PLAIN);
431-
}
432407
} else {
433-
if (fileName.isPresent()) {
434-
request.addStatement(
435-
"multipartForm.append($S, () -> $L.toString(), $S, $S)",
436-
annotation.value(),
437-
paramName,
438-
MediaType.TEXT_PLAIN,
439-
fileName.get().value());
408+
if (processorUtil.isStringType(variableElement.asType())) {
409+
if (fileName.isPresent()) {
410+
request.addStatement(
411+
"multipartForm.append($S, () -> $L, $S, $S)",
412+
annotation.value(),
413+
paramName,
414+
MediaType.TEXT_PLAIN,
415+
fileName.get().value());
416+
} else {
417+
request.addStatement(
418+
"multipartForm.append($S, () -> $L, $S)",
419+
annotation.value(),
420+
paramName,
421+
MediaType.TEXT_PLAIN);
422+
}
423+
} else if (processorUtil.isPrimitive(variableElement.asType())) {
424+
if (fileName.isPresent()) {
425+
request.addStatement(
426+
"multipartForm.append($S, () -> $T.valueOf($L), $S, $S)",
427+
annotation.value(),
428+
String.class,
429+
paramName,
430+
MediaType.TEXT_PLAIN,
431+
fileName.get().value());
432+
} else {
433+
request.addStatement(
434+
"multipartForm.append($S, () -> $T.valueOf($L), $S)",
435+
annotation.value(),
436+
String.class,
437+
paramName,
438+
MediaType.TEXT_PLAIN);
439+
}
440440
} else {
441-
request.addStatement(
442-
"multipartForm.append($S, () -> $L.toString(), $S)",
443-
annotation.value(),
444-
paramName,
445-
MediaType.TEXT_PLAIN);
441+
if (fileName.isPresent()) {
442+
request.addStatement(
443+
"multipartForm.append($S, () -> $L.toString(), $S, $S)",
444+
annotation.value(),
445+
paramName,
446+
MediaType.TEXT_PLAIN,
447+
fileName.get().value());
448+
} else {
449+
request.addStatement(
450+
"multipartForm.append($S, () -> $L.toString(), $S)",
451+
annotation.value(),
452+
paramName,
453+
MediaType.TEXT_PLAIN);
454+
}
446455
}
447456
}
448457
}

‎domino-rest-shared/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC5</version>
8+
<version>1.0.0-RC6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎domino-rest-test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>domino-rest</artifactId>
77
<groupId>org.dominokit</groupId>
8-
<version>1.0.0-RC5</version>
8+
<version>1.0.0-RC6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.dominokit</groupId>
77
<artifactId>domino-rest</artifactId>
8-
<version>1.0.0-RC5</version>
8+
<version>1.0.0-RC6</version>
99
<packaging>pom</packaging>
1010

1111
<name>domino-rest</name>
@@ -70,7 +70,7 @@
7070

7171
<properties>
7272
<snapshot.version>HEAD-SNAPSHOT</snapshot.version>
73-
<next.release.version>1.0.0-RC5</next.release.version>
73+
<next.release.version>1.0.0-RC6</next.release.version>
7474
<maven.compiler.source>1.8</maven.compiler.source>
7575
<maven.compiler.target>1.8</maven.compiler.target>
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)