diff options
Diffstat (limited to 'cps-ri/src/main')
3 files changed, 2 insertions, 109 deletions
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java index ef327c2592..23a384306f 100644 --- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java @@ -32,11 +32,9 @@ import org.onap.cps.spi.entities.Dataspace; import org.onap.cps.spi.entities.SchemaSet; import org.onap.cps.spi.entities.YangResource; import org.onap.cps.spi.exceptions.SchemaSetAlreadyDefinedException; -import org.onap.cps.spi.model.ModuleReference; import org.onap.cps.spi.repository.DataspaceRepository; import org.onap.cps.spi.repository.SchemaSetRepository; import org.onap.cps.spi.repository.YangResourceRepository; -import org.onap.cps.yang.YangTextSchemaSourceSetBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Component; @@ -55,13 +53,6 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ private DataspaceRepository dataspaceRepository; @Override - public void storeModule(final String namespace, final String moduleContent, final String revision, - final String dataspaceName) { - // TODO this method should be removed as obsolete. - // Modules to be processed within schema sets only. - } - - @Override @Transactional public void storeSchemaSet(final String dataspaceName, final String schemaSetName, final Map<String, String> yangResourcesNameToContentMap) { @@ -109,11 +100,10 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ } @Override - public Collection<ModuleReference> getModuleReferences(final String dataspaceName, final String schemaSetName) { + public Map<String, String> getYangSchemaResources(final String dataspaceName, final String schemaSetName) { final Dataspace dataspace = dataspaceRepository.getByName(dataspaceName); final SchemaSet schemaSet = schemaSetRepository.getByDataspaceAndName(dataspace, schemaSetName); - final Map<String, String> yangResourceNameToContent = schemaSet.getYangResources().stream().collect( + return schemaSet.getYangResources().stream().collect( Collectors.toMap(YangResource::getName, YangResource::getContent)); - return YangTextSchemaSourceSetBuilder.of(yangResourceNameToContent).getModuleReferences(); } } diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistenceServiceImpl.java deleted file mode 100755 index 51790f390d..0000000000 --- a/cps-ri/src/main/java/org/onap/cps/spi/impl/DataPersistenceServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2020 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. - * 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.spi.impl; - -import org.onap.cps.spi.DataPersistenceService; -import org.onap.cps.spi.entities.JsonDataEntity; -import org.onap.cps.spi.repository.DataRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class DataPersistenceServiceImpl implements DataPersistenceService { - - @Autowired - private DataRepository dataRepository; - - /** - * Method to store a JSON data structure in the database. - * - * @param jsonStructure the JSON data structure. - * @return the entity identifier. - */ - @Override - public final Integer storeJsonStructure(final String jsonStructure) { - final JsonDataEntity jsonDataEntity = new JsonDataEntity(jsonStructure); - dataRepository.save(jsonDataEntity); - return jsonDataEntity.getId(); - } - - /* - * Return the JSON structure from the database using the object identifier. - * - * @param jsonStructureId the JSON object identifier. - * - * @return the JSON structure from the database as a string. - */ - @Override - public final String getJsonById(final int jsonStructureId) { - return dataRepository.getOne(jsonStructureId).getJsonStructure(); - } - - /** - * Delete the JSON structure from the database using the object identifier. - * - * @param jsonStructureId the JSON object identifier. - */ - @Override - public void deleteJsonById(final int jsonStructureId) { - dataRepository.deleteById(jsonStructureId); - } - -} diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java deleted file mode 100644 index f3dd586007..0000000000 --- a/cps-ri/src/main/java/org/onap/cps/spi/repository/DataRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2020 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. - * 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.spi.repository; - -import org.onap.cps.spi.entities.JsonDataEntity; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface DataRepository extends JpaRepository<JsonDataEntity, Integer> { -}
\ No newline at end of file |