From: efiacor <fiachra.corcoran@est.tech>
Date: Fri, 22 Jul 2022 12:28:38 +0000 (+0100)
Subject: [DMAAP-MR] Remove acl update for deny
X-Git-Tag: 1.4.1~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F130012%2F1;p=dmaap%2Fmessagerouter%2Fmessageservice.git

[DMAAP-MR] Remove acl update for deny

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I97f443730d21daf0652f334cd5a4efa1e3a5b708
Issue-ID: DMAAP-1744
---

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
index 92aea97..386fb97 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
@@ -444,9 +444,13 @@ public class TopicServiceImpl implements TopicService {
 			throw new TopicExistsException("Failed to revoke write access to producer [" + producerId
 					+ "] for topic. Topic [" + topicName + "] does not exist.");
 		}
-		topic.denyWritesFromUser(producerId, user);
-		LOGGER.info("Write access has been revoked to producer [" + producerId + "] for topic [" + topicName
+		if (isUseCustomAcls()) {
+			topic.denyWritesFromUser(producerId, user);
+			LOGGER.info("Write access has been revoked to producer [" + producerId + "] for topic [" + topicName
 				+ "]. Sending response.");
+		} else {
+			LOGGER.info("Ignoring acl update");
+		}
 		respondOk(dmaapContext, "Write access has been revoked for publisher.");
 	}
 
@@ -500,9 +504,13 @@ public class TopicServiceImpl implements TopicService {
 			throw new TopicExistsException("Failed to permit read access to consumer [" + consumerId
 					+ "] for topic. Topic [" + topicName + "] does not exist.");
 		}
-		topic.denyReadsByUser(consumerId, user);
-		LOGGER.info("Read access has been revoked to consumer [" + consumerId + "] for topic [" + topicName
+		if (isUseCustomAcls()) {
+			topic.denyReadsByUser(consumerId, user);
+			LOGGER.info("Read access has been revoked to consumer [" + consumerId + "] for topic [" + topicName
 				+ "]. Sending response.");
+		} else {
+			LOGGER.info("Ignoring acl update");
+		}
 		respondOk(dmaapContext,
 				"Read access has been revoked for consumer [" + consumerId + "] for topic [" + topicName + "].");