diff options
Diffstat (limited to 'cps-service/src/main/java')
| -rw-r--r-- | cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java | 41 | ||||
| -rw-r--r-- | cps-service/src/main/java/org/onap/cps/notification/NotificationService.java | 44 |
2 files changed, 73 insertions, 12 deletions
diff --git a/cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java b/cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java new file mode 100644 index 0000000000..eb75e3f75e --- /dev/null +++ b/cps-service/src/main/java/org/onap/cps/notification/NotificationProperties.java @@ -0,0 +1,41 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Bell Canada. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.cps.notification; + +import java.util.Collections; +import java.util.Map; +import javax.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@ConfigurationProperties(prefix = "notification.data-updated") +@Component +@Data +@Validated +public class NotificationProperties { + + @NotNull + private String topic; + private Map<String, String> filters = Collections.emptyMap(); + @NotNull + private boolean enabled = false; +} diff --git a/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java b/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java index 67fc54ba2b..9cb2c52e01 100644 --- a/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java +++ b/cps-service/src/main/java/org/onap/cps/notification/NotificationService.java @@ -18,39 +18,56 @@ package org.onap.cps.notification; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @Service @Slf4j public class NotificationService { - private boolean dataUpdatedEventNotificationEnabled; + private NotificationProperties notificationProperties; private NotificationPublisher notificationPublisher; private CpsDataUpdatedEventFactory cpsDataUpdatedEventFactory; private NotificationErrorHandler notificationErrorHandler; + private List<Pattern> dataspacePatterns; /** * Create an instance of Notification Subscriber. * - * @param dataUpdatedEventNotificationEnabled notification can be enabled by setting - * 'notification.data-updated.enabled=true' in application properties - * @param notificationPublisher notification Publisher - * @param cpsDataUpdatedEventFactory to create CPSDataUpdatedEvent - * @param notificationErrorHandler error handler + * @param notificationProperties properties for notification + * @param notificationPublisher notification Publisher + * @param cpsDataUpdatedEventFactory to create CPSDataUpdatedEvent + * @param notificationErrorHandler error handler */ @Autowired public NotificationService( - @Value("${notification.data-updated.enabled}") final boolean dataUpdatedEventNotificationEnabled, + final NotificationProperties notificationProperties, final NotificationPublisher notificationPublisher, final CpsDataUpdatedEventFactory cpsDataUpdatedEventFactory, final NotificationErrorHandler notificationErrorHandler) { - this.dataUpdatedEventNotificationEnabled = dataUpdatedEventNotificationEnabled; + this.notificationProperties = notificationProperties; this.notificationPublisher = notificationPublisher; this.cpsDataUpdatedEventFactory = cpsDataUpdatedEventFactory; this.notificationErrorHandler = notificationErrorHandler; + this.dataspacePatterns = getDataspaceFilterPatterns(notificationProperties); + } + + private List<Pattern> getDataspaceFilterPatterns(final NotificationProperties notificationProperties) { + if (notificationProperties.isEnabled()) { + return Arrays.stream(notificationProperties.getFilters() + .getOrDefault("enabled-dataspaces", "") + .split(",")) + .map(filterPattern -> Pattern.compile(filterPattern, Pattern.CASE_INSENSITIVE)) + .collect(Collectors.toList()); + } else { + return Collections.emptyList(); + } } /** @@ -62,7 +79,7 @@ public class NotificationService { public void processDataUpdatedEvent(final String dataspaceName, final String anchorName) { log.debug("process data updated event for dataspace '{}' & anchor '{}'", dataspaceName, anchorName); try { - if (shouldSendNotification()) { + if (shouldSendNotification(dataspaceName)) { final var cpsDataUpdatedEvent = cpsDataUpdatedEventFactory.createCpsDataUpdatedEvent(dataspaceName, anchorName); log.debug("data updated event to be published {}", cpsDataUpdatedEvent); @@ -80,8 +97,11 @@ public class NotificationService { /* Add more complex rules based on dataspace and anchor later */ - private boolean shouldSendNotification() { - return dataUpdatedEventNotificationEnabled; + private boolean shouldSendNotification(final String dataspaceName) { + + return notificationProperties.isEnabled() + && dataspacePatterns.stream() + .anyMatch(pattern -> pattern.matcher(dataspaceName).find()); } } |