From fd9efa89fcf31880ba31e6dd2f49e932781952c7 Mon Sep 17 00:00:00 2001 From: efiacor Date: Fri, 22 Jul 2022 13:28:38 +0100 Subject: [PATCH] [DMAAP-MR] Remove acl update for deny Signed-off-by: efiacor Change-Id: I97f443730d21daf0652f334cd5a4efa1e3a5b708 Issue-ID: DMAAP-1744 --- .../onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 + "]."); -- 2.16.6