Merge "Remove depredcated classes"

3 files changed, 0 insertions, 146 deletions

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
diff --git a/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java
deleted file mode 100644
index a3cbc28c55..0000000000
--- a/cps-service/src/main/java/org/onap/cps/spi/DataPersistenceService.java
+++ /dev/null
@@ -1,49 +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;
-
-/**
- * Defines methods to access and manipulate data using the chosen database solution.
- */
-public interface DataPersistenceService {
-
-    /**
-     * Store the JSON structure in the database.
-     *
-     * @param jsonStructure the JSON structure.
-     * @return jsonEntityID the ID of the JSON entity.
-     */
-    Integer storeJsonStructure(final String jsonStructure);
-
-    /**
-     * Get the JSON structure from the database using the entity identifier.
-     *
-     * @param jsonStructureId the json entity identifier.
-     * @return a JSON Structure.
-     */
-    String getJsonById(int jsonStructureId);
-
-    /**
-     * Delete the JSON structure from the database using the entity identifier.
-     *
-     * @param jsonStructureId the json entity identifier.
-     */
-    void deleteJsonById(int jsonStructureId);
-}
\ No newline at end of file