[nifi-registry] branch master updated: NIFIREG-385 Returning default Revision with version 0 on RevisableEntity when revisions are disabled, so that there is always a non-null revision in case it is referenced

[bbende]

This is an automated email from the ASF dual-hosted git repository.

bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
     new 0bb47e8  NIFIREG-385 Returning default Revision with version 0 on 
RevisableEntity when revisions are disabled, so that there is always a non-null 
revision in case it is referenced
0bb47e8 is described below

commit 0bb47e8d6c22413d5ba27769250124696dead4de
Author: Bryan Bende <bbe...@apache.org>
AuthorDate: Mon Jul 6 12:06:46 2020 -0400

    NIFIREG-385 Returning default Revision with version 0 on RevisableEntity 
when revisions are disabled, so that there is always a non-null revision in 
case it is referenced
    
    This closes #284.
---
 .../nifi-registry-docker/dockerhub/Dockerfile          |  2 +-
 .../registry/web/service/StandardServiceFacade.java    | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile 
b/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
index 5fabb95..623c613 100644
--- a/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
+++ b/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org";
 
 ARG UID=1000
 ARG GID=1000
-ARG NIFI_REGISTRY_VERSION=1.0.0
+ARG NIFI_REGISTRY_VERSION=0.7.0
 ARG MIRROR=https://archive.apache.org/dist
 
 ENV NIFI_REGISTRY_BASE_DIR /opt/nifi-registry
diff --git 
a/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/service/StandardServiceFacade.java
 
b/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/service/StandardServiceFacade.java
index f5bfb01..85be421 100644
--- 
a/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/service/StandardServiceFacade.java
+++ 
b/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/service/StandardServiceFacade.java
@@ -1191,7 +1191,11 @@ public class StandardServiceFacade implements 
ServiceFacade {
 
         // skip using the entity service if revision feature is disabled
         if (!revisionFeature.isEnabled()) {
-            return createEntity.get();
+            final T entity = createEntity.get();
+            if (entity.getRevision() == null) {
+                entity.setRevision(new RevisionInfo(null, 0L));
+            }
+            return entity;
         } else {
             try {
                 return entityService.create(requestEntity, creatorIdentity, 
createEntity);
@@ -1207,7 +1211,11 @@ public class StandardServiceFacade implements 
ServiceFacade {
 
         // skip using the entity service if revision feature is disabled
         if (!revisionFeature.isEnabled()) {
-            return updateEntity.get();
+            final T entity = updateEntity.get();
+            if (entity.getRevision() == null) {
+                entity.setRevision(new RevisionInfo(null, 0L));
+            }
+            return entity;
         } else {
             try {
                 return entityService.update(requestEntity, updaterIdentity, 
updateEntity);
@@ -1222,7 +1230,11 @@ public class StandardServiceFacade implements 
ServiceFacade {
                                                  final RevisionInfo 
revisionInfo, final Supplier<T> deleteEntity) {
         // skip using the entity service if revision feature is disabled
         if (!revisionFeature.isEnabled()) {
-            return deleteEntity.get();
+            final T entity = deleteEntity.get();
+            if (entity.getRevision() == null) {
+                entity.setRevision(new RevisionInfo(null, 0L));
+            }
+            return entity;
         } else {
             try {
                 return entityService.delete(entityIdentifier, revisionInfo, 
deleteEntity);