-package org.onap.cps.api.impl;
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2020 Pantheon.tech
+ * Copyright (C) 2021 Pantheon.tech
+ * Modifications Copyright (C) 2022 Bell Canada
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation
* ================================================================================
* 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.
* ============LICENSE_END=========================================================
*/
+package org.onap.cps.api.impl;
+
import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import io.micrometer.core.instrument.Metrics;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import lombok.RequiredArgsConstructor;
import org.onap.cps.spi.CpsModulePersistenceService;
+import org.onap.cps.spi.utils.CpsValidator;
import org.onap.cps.yang.YangTextSchemaSourceSet;
import org.onap.cps.yang.YangTextSchemaSourceSetBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
*/
@Service
@CacheConfig(cacheNames = {"yangSchema"})
+@RequiredArgsConstructor
public class YangTextSchemaSourceSetCache {
- @Autowired
- private CpsModulePersistenceService cpsModulePersistenceService;
+ private final CpsModulePersistenceService cpsModulePersistenceService;
+ private final CpsValidator cpsValidator;
+
+ private final AtomicInteger yangSchemaCacheCounter = Metrics.gauge("cps.yangschema.cache.gauge",
+ new AtomicInteger(0));
/**
* Cache YangTextSchemaSourceSet.
*/
@Cacheable(key = "#p0.concat('-').concat(#p1)")
public YangTextSchemaSourceSet get(final String dataspaceName, final String schemaSetName) {
+ cpsValidator.validateNameCharacters(dataspaceName, schemaSetName);
final Map<String, String> yangResourceNameToContent =
cpsModulePersistenceService.getYangSchemaResources(dataspaceName, schemaSetName);
return YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent);
/**
* Updates cache YangTextSchemaSourceSet.
*
- * @param dataspaceName dataspace name
- * @param schemaSetName schema set name
+ * @param dataspaceName dataspace name
+ * @param schemaSetName schema set name
* @param yangTextSchemaSourceSet yangTextSchemaSourceSet
* @return YangTextSchemaSourceSet
*/
@CanIgnoreReturnValue
public YangTextSchemaSourceSet updateCache(final String dataspaceName, final String schemaSetName,
final YangTextSchemaSourceSet yangTextSchemaSourceSet) {
+ cpsValidator.validateNameCharacters(dataspaceName, schemaSetName);
+ yangSchemaCacheCounter.incrementAndGet();
return yangTextSchemaSourceSet;
}
+
+ /**
+ * Remove the cached value for the given dataspace and schema-set.
+ *
+ * @param dataspaceName dataspace name
+ * @param schemaSetName schema set name
+ */
+ @CacheEvict(key = "#p0.concat('-').concat(#p1)")
+ public void removeFromCache(final String dataspaceName, final String schemaSetName) {
+ cpsValidator.validateNameCharacters(dataspaceName, schemaSetName);
+ yangSchemaCacheCounter.decrementAndGet();
+ // Spring provides implementation for removing object from cache
+ }
+
}