From a0da7f6b3e04ee6f06f4580f8a14e60f3438d5e7 Mon Sep 17 00:00:00 2001 From: niamhcore Date: Fri, 11 Dec 2020 12:37:35 +0000 Subject: Remove depredcated code/classes Issue-ID: CPS-93 Signed-off-by: niamhcore Change-Id: I49db5244400d5eb4206d59e73aaf801b7f90c61c --- .../src/main/java/org/onap/cps/api/CpService.java | 51 ---------------------- .../java/org/onap/cps/api/CpsModuleService.java | 17 -------- .../java/org/onap/cps/api/impl/CpServiceImpl.java | 49 --------------------- .../onap/cps/api/impl/CpsModuleServiceImpl.java | 32 -------------- 4 files changed, 149 deletions(-) delete mode 100755 cps-service/src/main/java/org/onap/cps/api/CpService.java delete mode 100755 cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java (limited to 'cps-service/src/main/java/org') diff --git a/cps-service/src/main/java/org/onap/cps/api/CpService.java b/cps-service/src/main/java/org/onap/cps/api/CpService.java deleted file mode 100755 index 29e164d62..000000000 --- a/cps-service/src/main/java/org/onap/cps/api/CpService.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation - * Modifications Copyright (C) 2020 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.api; - -/** - * Configuration and persistency service interface which holds methods for parsing and storing yang models and data. - */ -public interface CpService { - - /** - * Store the JSON structure in the database. - * - * @param jsonStructure the JSON structure. - * @return entity ID. - */ - Integer storeJsonStructure(String jsonStructure); - - /** - * Read a JSON Object using the object identifier. - * - * @param jsonObjectId the JSON object identifier. - * @return the JSON structure. - */ - String getJsonById(int jsonObjectId); - - /** - * Delete a JSON Object using the object identifier. - * - * @param jsonObjectId the JSON object identifier. - */ - void deleteJsonById(int jsonObjectId); - -} diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java b/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java index 94ebea2fc..325893d6f 100644 --- a/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java +++ b/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java @@ -19,7 +19,6 @@ package org.onap.cps.api; -import java.io.File; import org.onap.cps.spi.exceptions.CpsException; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -28,22 +27,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; */ public interface CpsModuleService { - /** - * Parse and validate a string representing a yang model to generate a schema context. - * - * @param yangModelContent the input stream - * @return the schema context - */ - SchemaContext parseAndValidateModel(String yangModelContent); - - /** - * Parse and validate a file representing a yang model to generate a schema context. - * - * @param yangModelFile the yang file - * @return the schema context - */ - SchemaContext parseAndValidateModel(File yangModelFile); - /** * Store schema context for a yang model. * diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java deleted file mode 100755 index 3ec08cd73..000000000 --- a/cps-service/src/main/java/org/onap/cps/api/impl/CpServiceImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation - * Modifications Copyright (C) 2020 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.api.impl; - -import org.onap.cps.api.CpService; -import org.onap.cps.spi.DataPersistenceService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class CpServiceImpl implements CpService { - - @Autowired - private DataPersistenceService dataPersistenceService; - - - @Override - public final Integer storeJsonStructure(final String jsonStructure) { - return dataPersistenceService.storeJsonStructure(jsonStructure); - } - - @Override - public final String getJsonById(final int jsonObjectId) { - return dataPersistenceService.getJsonById(jsonObjectId); - } - - @Override - public void deleteJsonById(final int jsonObjectId) { - dataPersistenceService.deleteJsonById(jsonObjectId); - } -} \ No newline at end of file diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java index c7fa04759..2c600b557 100644 --- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java +++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java @@ -20,20 +20,12 @@ package org.onap.cps.api.impl; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.util.Optional; import org.onap.cps.api.CpsModuleService; import org.onap.cps.spi.CpsModulePersistenceService; -import org.onap.cps.spi.exceptions.CpsException; -import org.onap.cps.spi.exceptions.ModelValidationException; -import org.onap.cps.utils.YangUtils; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -43,30 +35,6 @@ public class CpsModuleServiceImpl implements CpsModuleService { @Autowired private CpsModulePersistenceService cpsModulePersistenceService; - @Override - public SchemaContext parseAndValidateModel(final String yangModelContent) { - try { - final File tempFile = File.createTempFile("yang", ".yang"); - try (final BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile))) { - writer.write(yangModelContent); - } - return parseAndValidateModel(tempFile); - } catch (final IOException e) { - throw new CpsException(e); - } - } - - @Override - public SchemaContext parseAndValidateModel(final File yangModelFile) { - try { - return YangUtils.parseYangModelFile(yangModelFile); - } catch (final YangParserException e) { - throw new ModelValidationException("Yang file validation failed", e.getMessage(), e); - } catch (final IOException e) { - throw new CpsException(e); - } - } - @Override public void storeSchemaContext(final SchemaContext schemaContext, final String dataspaceName) { for (final Module module : schemaContext.getModules()) { -- cgit 1.2.3-korg