[
https://issues.apache.org/jira/browse/BEAM-11530?focusedWorklogId=529562&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-529562
]
ASF GitHub Bot logged work on BEAM-11530:
-----------------------------------------
Author: ASF GitHub Bot
Created on: 30/Dec/20 17:04
Start Date: 30/Dec/20 17:04
Worklog Time Spent: 10m
Work Description: TheNeuralBit commented on a change in pull request
#13622:
URL: https://github.com/apache/beam/pull/13622#discussion_r550261069
##########
File path:
sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/FieldValueTypeInformation.java
##########
@@ -176,39 +177,38 @@ public static FieldValueTypeInformation forGetter(Method
method) {
}
private static boolean hasNullableAnnotation(Field field) {
- for (Annotation annotation : field.getAnnotations()) {
- if (isNullableAnnotation(annotation)) {
- return true;
- }
- }
-
- for (Annotation annotation : field.getAnnotatedType().getAnnotations()) {
- if (isNullableAnnotation(annotation)) {
- return true;
- }
- }
+ Stream<Annotation> annotations =
+ Stream.concat(
+ Stream.of(field.getAnnotations()),
+ Stream.of(field.getAnnotatedType().getAnnotations()));
- return false;
+ return
annotations.anyMatch(FieldValueTypeInformation::isNullableAnnotation);
}
/**
* If the method or its return type are annotated with any variant of
Nullable, then the schema
* field is nullable.
*/
private static boolean hasNullableReturnType(Method method) {
- for (Annotation annotation : method.getAnnotations()) {
- if (isNullableAnnotation(annotation)) {
- return true;
- }
- }
+ Stream<Annotation> annotations =
+ Stream.concat(
+ Stream.of(method.getAnnotations()),
+ Stream.of(method.getAnnotatedReturnType().getAnnotations()));
- for (Annotation annotation :
method.getAnnotatedReturnType().getAnnotations()) {
- if (isNullableAnnotation(annotation)) {
- return true;
- }
+ return
annotations.anyMatch(FieldValueTypeInformation::isNullableAnnotation);
+ }
+
+ private static boolean hasSingleNullableParameter(Method method) {
+ if (method.getParameterCount() != 1) {
+ throw new RuntimeException("Setter methods should take a single
argument.");
Review comment:
nit: Let's add the method name to this exception so it's more actionable
```suggestion
throw new RuntimeException("Setter methods should take a single
argument " + method.getName());
```
##########
File path:
sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java
##########
@@ -216,6 +219,39 @@ public void testNullableFromRow() throws
NoSuchSchemaException {
assertNull(bean.getStringBuilder());
}
+ /**
+ * [BEAM-11530] Java distinguishes between parameter annotations and type
annotations. Therefore
+ * annotations declared without {@link
java.lang.annotation.ElementType#TYPE_USE} can't be
+ * accessed through {@link Executable#getAnnotatedParameterTypes()}. Some
{@code @Nullable}
+ * annotations like {@link org.apache.avro.reflect.Nullable} do not declare
{@link
+ * java.lang.annotation.ElementType#TYPE_USE} which makes them parameter
annotations once placed
+ * in front of a parameter.
+ *
+ * @see <a
+ *
href="https://stackoverflow.com/a/37587590/5896429";>https://stackoverflow.com/a/37587590/5896429</a>
+ * @see <a
+ *
href="https://github.com/apache/beam/pull/13622";>https://github.com/apache/beam/pull/13622</a>
+ */
Review comment:
Thank you this works :)
nit: we don't need the link to the PR, it can be found through `git blame`
or the jira
```suggestion
*/
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 529562)
Time Spent: 3h 10m (was: 3h)
> Annotated setter parameters handled wrong in schema creation
> ------------------------------------------------------------
>
> Key: BEAM-11530
> URL: https://issues.apache.org/jira/browse/BEAM-11530
> Project: Beam
> Issue Type: Bug
> Components: sdk-java-core
> Affects Versions: 2.26.0
> Environment: Linux & OpenJDK 15
> Reporter: Filip Krakowski
> Priority: P0
> Labels: annotation, fieldtype, parameter, schema
> Time Spent: 3h 10m
> Remaining Estimate: 0h
>
> I'm facing an exception telling me that my JavaBean contained a setter for a
> field that had a mismatching nullable attribute, although both getter and
> setter (parameters) are annotated with @Nullable.
>
> The code responsible for determining if a setter's parameter is nullable
> looks wrong to me, since it -does check if the type (class) itself is
> annotated with @Nullable instead of checking the actual parameter's
> annotations- only considers type annotations instead of looking at parameter
> annotations, too. Java distinguishes between parameter annotations and type
> annotations. Therefore annotations declared without
> _java.lang.annotation.ElementType#TYPE_USE_ can't be accessed through
> _Executable#getAnnotatedParameterTypes()_.
>
> [FieldValueTypeInformation|https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/FieldValueTypeInformation.java#L234-L236]
> {code:java}
> boolean nullable =
> Arrays.stream(method.getParameters()[0].getAnnotatedType().getAnnotations())
> .anyMatch(annotation -> isNullableAnnotation(annotation));{code}
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
