From 8ba0ad46ac2f74051ca8e394c65bc4b796733cf3 Mon Sep 17 00:00:00 2001 From: ToineSiebelink Date: Tue, 2 Sep 2025 10:13:32 +0100 Subject: [PATCH] Fix more spelling mistakes - Remove time stamp formatting from comments (its OK in code) (also reused existing formatter utility) - added . (full stops) separators in counter names to make them acceptable words Issue-ID: CPS-2972 Change-Id: I6ee457fac880edd35b141b8c8b785208ca338e48 Signed-off-by: ToineSiebelink --- .../onap/cps/ncmp/api/inventory/models/CompositeState.java | 11 +++-------- .../cmnotificationsubscription/cmavc/CmAvcEventConsumer.java | 2 +- .../org/onap/cps/ncmp/impl/utils/EventDateTimeFormatter.java | 4 +--- .../onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java | 12 ++++++------ 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/models/CompositeState.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/models/CompositeState.java index e02be318d2..bef06ade86 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/models/CompositeState.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/models/CompositeState.java @@ -23,13 +23,13 @@ package org.onap.cps.ncmp.api.inventory.models; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.onap.cps.ncmp.api.inventory.DataStoreSyncState; +import org.onap.cps.ncmp.impl.utils.EventDateTimeFormatter; /** * State Model to store state corresponding to the Yang resource dmi-registry model. @@ -55,11 +55,6 @@ public class CompositeState { @JsonProperty("datastores") private DataStores dataStores; - /** - * Date and Time in the format of yyyy-MM-dd'T'HH:mm:ss.SSSZ - */ - private static final DateTimeFormatter dateTimeFormatter = - DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); /** * Composite State copy constructor. @@ -117,10 +112,10 @@ public class CompositeState { /** * The date and time format used for the cm handle sync state. * - * @return the date and time in the format of yyyy-MM-dd'T'HH:mm:ss.SSSZ + * @return the date and time in the ISO standard format */ public static String nowInSyncTimeFormat() { - return dateTimeFormatter.format(OffsetDateTime.now()); + return EventDateTimeFormatter.ISO_TIMESTAMP_FORMATTER.format(OffsetDateTime.now()); } /** diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java index b18c7f9a1a..d136bce4c3 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/cmnotificationsubscription/cmavc/CmAvcEventConsumer.java @@ -66,7 +66,7 @@ public class CmAvcEventConsumer { */ @KafkaListener(topics = "${app.dmi.cm-events.topic}", containerFactory = "cloudEventConcurrentKafkaListenerContainerFactory") - @Timed(value = "cps.ncmp.cmnotifications.consumeandforward", description = "Time taken to forward CM AVC events") + @Timed(value = "cps.ncmp.cm.notifications.consume.and.forward", description = "Time taken to forward CM AVC events") public void consumeAndForward(final ConsumerRecord cmAvcEventAsConsumerRecord) { if (isEventFromOnapDmiPlugin(cmAvcEventAsConsumerRecord.headers())) { processCmAvcEventChanges(cmAvcEventAsConsumerRecord); diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/EventDateTimeFormatter.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/EventDateTimeFormatter.java index 9284c0fab7..56c4028324 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/EventDateTimeFormatter.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/EventDateTimeFormatter.java @@ -27,9 +27,7 @@ import org.apache.commons.lang3.StringUtils; public interface EventDateTimeFormatter { - String ISO_TIMESTAMP_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"; - - DateTimeFormatter ISO_TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern(ISO_TIMESTAMP_PATTERN); + DateTimeFormatter ISO_TIMESTAMP_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); /** * Gets current date time. diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java index 5b93c18da4..4b8a95cee1 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java @@ -34,10 +34,10 @@ import org.springframework.stereotype.Service; @Service public class CmDataSubscriptionModelLoader extends AbstractModelLoader { - private static final String MODEL_FILENAME = "cm-data-job-subscriptions@2025-07-16.yang"; - private static final String SCHEMASET_NAME = "cm-data-job-subscriptions"; + private static final String MODEL_FILE_NAME = "cm-data-job-subscriptions@2025-07-16.yang"; + private static final String SCHEMA_SET_NAME = "cm-data-job-subscriptions"; private static final String ANCHOR_NAME = "cm-data-job-subscriptions"; - private static final String REGISTRY_DATANODE_NAME = "dataJob"; + private static final String REGISTRY_DATA_NODE_NAME = "dataJob"; public CmDataSubscriptionModelLoader(final CpsDataspaceService cpsDataspaceService, final CpsModuleService cpsModuleService, final CpsAnchorService cpsAnchorService, @@ -53,9 +53,9 @@ public class CmDataSubscriptionModelLoader extends AbstractModelLoader { private void onboardSubscriptionModels() { createDataspace(NCMP_DATASPACE_NAME); - createSchemaSet(NCMP_DATASPACE_NAME, SCHEMASET_NAME, MODEL_FILENAME); - createAnchor(NCMP_DATASPACE_NAME, SCHEMASET_NAME, ANCHOR_NAME); - createTopLevelDataNode(NCMP_DATASPACE_NAME, ANCHOR_NAME, REGISTRY_DATANODE_NAME); + createSchemaSet(NCMP_DATASPACE_NAME, SCHEMA_SET_NAME, MODEL_FILE_NAME); + createAnchor(NCMP_DATASPACE_NAME, SCHEMA_SET_NAME, ANCHOR_NAME); + createTopLevelDataNode(NCMP_DATASPACE_NAME, ANCHOR_NAME, REGISTRY_DATA_NODE_NAME); } } -- 2.16.6