bbende commented on code in PR #9239:
URL: https://github.com/apache/nifi/pull/9239#discussion_r1778749488
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -70,7 +88,12 @@ public static Event flowUpdated(final VersionedFlow
versionedFlow) {
return new StandardEvent.Builder()
.eventType(EventType.UPDATE_FLOW)
.addField(EventFieldName.BUCKET_ID,
versionedFlow.getBucketIdentifier())
+ .addField(EventFieldName.BUCKET_NAME,
versionedFlow.getBucketName())
.addField(EventFieldName.FLOW_ID,
versionedFlow.getIdentifier())
+ .addField(EventFieldName.FLOW_NAME, versionedFlow.getName())
+ .addField(EventFieldName.FLOW_DESCRIPTION,
versionedFlow.getDescription())
+ .addField(EventFieldName.CREATED_TIMESTAMP,
String.valueOf(versionedFlow.getCreatedTimestamp()))
+ .addField(EventFieldName.MODIFIED_TIMESTAMP,
String.valueOf(versionedFlow.getModifiedTimestamp()))
Review Comment:
If the outcome of the previous comment is to keep the revision in
`CREATE_FLOW` then seems like it would be needed on each `UPDATE_FLOW` event as
well.
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -61,7 +73,13 @@ public static Event flowCreated(final VersionedFlow
versionedFlow) {
return new StandardEvent.Builder()
.eventType(EventType.CREATE_FLOW)
.addField(EventFieldName.BUCKET_ID,
versionedFlow.getBucketIdentifier())
+ .addField(EventFieldName.BUCKET_NAME,
versionedFlow.getBucketName())
.addField(EventFieldName.FLOW_ID,
versionedFlow.getIdentifier())
+ .addField(EventFieldName.FLOW_NAME, versionedFlow.getName())
+ .addField(EventFieldName.FLOW_DESCRIPTION,
versionedFlow.getDescription())
+ .addField(EventFieldName.CREATED_TIMESTAMP,
String.valueOf(versionedFlow.getCreatedTimestamp()))
+ .addField(EventFieldName.MODIFIED_TIMESTAMP,
String.valueOf(versionedFlow.getModifiedTimestamp()))
+ .addField(EventFieldName.FLOW_VERSION,
String.valueOf(versionedFlow.getRevision().getVersion()))
Review Comment:
Does the event really need the revision info?
If there is a reason to include the revision info, then I would rename the
field to something like `FLOW_REVISION`, or something that makes it clear that
it is different from the `VERSION` field which is on each snapshot and is what
most people I think would say is the "flow version".
The revision field is something used for optimistic locking in the API when
making updates to the flow itself, like two people trying to change the name of
the flow. This is only enforced if `nifi.registry.revisions.enabled=false` is
changed to true.
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -53,6 +61,10 @@ public static Event bucketDeleted(final Bucket bucket) {
return new StandardEvent.Builder()
.eventType(EventType.DELETE_BUCKET)
.addField(EventFieldName.BUCKET_ID, bucket.getIdentifier())
+ .addField(EventFieldName.BUCKET_NAME, bucket.getName())
+ .addField(EventFieldName.BUCKET_DESCRIPTION,
bucket.getDescription())
Review Comment:
Handle null
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -70,7 +88,12 @@ public static Event flowUpdated(final VersionedFlow
versionedFlow) {
return new StandardEvent.Builder()
.eventType(EventType.UPDATE_FLOW)
.addField(EventFieldName.BUCKET_ID,
versionedFlow.getBucketIdentifier())
+ .addField(EventFieldName.BUCKET_NAME,
versionedFlow.getBucketName())
.addField(EventFieldName.FLOW_ID,
versionedFlow.getIdentifier())
+ .addField(EventFieldName.FLOW_NAME, versionedFlow.getName())
+ .addField(EventFieldName.FLOW_DESCRIPTION,
versionedFlow.getDescription())
Review Comment:
Handle null
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -79,7 +102,12 @@ public static Event flowDeleted(final VersionedFlow
versionedFlow) {
return new StandardEvent.Builder()
.eventType(EventType.DELETE_FLOW)
.addField(EventFieldName.BUCKET_ID,
versionedFlow.getBucketIdentifier())
+ .addField(EventFieldName.BUCKET_NAME,
versionedFlow.getBucketName())
.addField(EventFieldName.FLOW_ID,
versionedFlow.getIdentifier())
+ .addField(EventFieldName.FLOW_NAME, versionedFlow.getName())
+ .addField(EventFieldName.FLOW_DESCRIPTION,
versionedFlow.getDescription())
Review Comment:
Handle null
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -45,6 +49,10 @@ public static Event bucketUpdated(final Bucket bucket) {
return new StandardEvent.Builder()
.eventType(EventType.UPDATE_BUCKET)
.addField(EventFieldName.BUCKET_ID, bucket.getIdentifier())
+ .addField(EventFieldName.BUCKET_NAME, bucket.getName())
+ .addField(EventFieldName.BUCKET_DESCRIPTION,
bucket.getDescription())
Review Comment:
Handle null
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -37,6 +37,10 @@ public static Event bucketCreated(final Bucket bucket) {
return new StandardEvent.Builder()
.eventType(EventType.CREATE_BUCKET)
.addField(EventFieldName.BUCKET_ID, bucket.getIdentifier())
+ .addField(EventFieldName.BUCKET_NAME, bucket.getName())
+ .addField(EventFieldName.BUCKET_DESCRIPTION,
bucket.getDescription())
Review Comment:
The description of a bucket is optional and can be null. Currently the event
class doesn't accept null values so I think we'll have to make this conditional
to only set the description if not null, or maybe set empty string in the event
if null.
Running the integration tests for registry produces a failing test with:
```
[qtp1243712710-92] ERROR org.apache.nifi.registry.web.mapper.ThrowableMapper
- An unexpected error. Returning Internal Server Error response.
java.lang.NullPointerException
at java.base/java.util.Objects.requireNonNull(Objects.java:233)
at
org.apache.nifi.registry.event.StandardEventField.<init>(StandardEventField.java:35)
at
org.apache.nifi.registry.event.StandardEvent$Builder.addField(StandardEvent.java:96)
at
org.apache.nifi.registry.event.EventFactory.bucketCreated(EventFactory.java:41)
at
org.apache.nifi.registry.web.api.BucketResource.createBucket(BucketResource.java:94)
at
java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
at **java.base/java.lang.reflect.Method.invoke(Method.java:580)**
```
From:
```
[ERROR] Errors:
[ERROR] DBFlowStorageIT.testAll:94 ยป NiFiRegistry Error creating bucket:
An unexpected error has occurred. Please check the logs for additional details.
```
`mvn clean install -Pintegration-tests` from `nifi/nifi-registry`
##########
nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/event/EventFactory.java:
##########
@@ -61,7 +73,13 @@ public static Event flowCreated(final VersionedFlow
versionedFlow) {
return new StandardEvent.Builder()
.eventType(EventType.CREATE_FLOW)
.addField(EventFieldName.BUCKET_ID,
versionedFlow.getBucketIdentifier())
+ .addField(EventFieldName.BUCKET_NAME,
versionedFlow.getBucketName())
.addField(EventFieldName.FLOW_ID,
versionedFlow.getIdentifier())
+ .addField(EventFieldName.FLOW_NAME, versionedFlow.getName())
+ .addField(EventFieldName.FLOW_DESCRIPTION,
versionedFlow.getDescription())
Review Comment:
Handle null
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]