A1 Policy Management, Removal of deprecated API

The V1 of the policy management API is removed from the code.

Issue-ID: CCSDK-3559
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I0b5cde71770fca3826ad18025094d1c8423f4cf3

11 files changed, 13 insertions, 1087 deletions

diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/SwaggerConfig.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/SwaggerConfig.java
index 357aa7b6..6d56c679 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/SwaggerConfig.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/SwaggerConfig.java
@@ -42,10 +42,6 @@ import org.onap.ccsdk.oran.a1policymanagementservice.controllers.v2.StatusContro
 @OpenAPIDefinition( //
         tags = { //
                 @Tag(//
-                        name = org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1.Consts.V1_API_NAME, //
-                        description = org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1.Consts.V1_API_DESCRIPTION //
-                ), //
-                @Tag(//
                         name = ConfigurationController.API_NAME, //
                         description = ConfigurationController.API_DESCRIPTION //
                 ), //
@@ -74,7 +70,8 @@ import org.onap.ccsdk.oran.a1policymanagementservice.controllers.v2.StatusContro
         info = @Info(title = SwaggerConfig.API_TITLE, //
                 version = SwaggerConfig.VERSION, //
                 description = SwaggerConfig.DESCRIPTION, //
-                license = @License(name = "Copyright (C) 2020 Nordix Foundation. Licensed under the Apache License.", //
+                license = @License(
+                        name = "Copyright (C) 2020-2022 Nordix Foundation. Licensed under the Apache License.", //
                         url = "http://www.apache.org/licenses/LICENSE-2.0")) //
 )
 public class SwaggerConfig {
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/Consts.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/Consts.java
deleted file mode 100644
index 44fc1cad..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/Consts.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-public class Consts {
-
-    public static final String V1_API_NAME = "A1 Policy Management V1.0";
-    public static final String V1_API_DESCRIPTION = "(deprecated primitves)";
-
-    private Consts() {}
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/PolicyController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/PolicyController.java
deleted file mode 100644
index bead6d11..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/PolicyController.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.lang.invoke.MethodHandles;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import lombok.Getter;
-
-import org.onap.ccsdk.oran.a1policymanagementservice.clients.A1ClientFactory;
-import org.onap.ccsdk.oran.a1policymanagementservice.controllers.VoidResponse;
-import org.onap.ccsdk.oran.a1policymanagementservice.controllers.v2.ErrorResponse;
-import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.EntityNotFoundException;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Lock.LockType;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policies;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policy;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyType;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyTypes;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Rics;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Service;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Services;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-@RestController
-@Tag(name = Consts.V1_API_NAME)
-public class PolicyController {
-
-    public static class RejectionException extends Exception {
-        private static final long serialVersionUID = 1L;
-        @Getter
-        private final HttpStatus status;
-
-        public RejectionException(String message, HttpStatus status) {
-            super(message);
-            this.status = status;
-        }
-    }
-
-    @Autowired
-    private Rics rics;
-    @Autowired
-    private PolicyTypes policyTypes;
-    @Autowired
-    private Policies policies;
-    @Autowired
-    private A1ClientFactory a1ClientFactory;
-    @Autowired
-    private Services services;
-
-    private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-    private static Gson gson = new GsonBuilder().create();
-
-    @GetMapping("/policy_schemas") //
-    @Operation(summary = "Returns policy type schema definitions") //
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policy schemas", //
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = Object.class)))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Near-RT RIC is not found", //
-                    content = @Content(schema = @Schema(implementation = ErrorResponse.ErrorInfo.class))) //
-    })
-    public ResponseEntity<String> getPolicySchemas( //
-            @Parameter(name = "ric", required = false,
-                    description = "The name of the Near-RT RIC to get the definitions for.") //
-            @RequestParam(name = "ric", required = false) String ricName) throws EntityNotFoundException {
-        if (ricName == null) {
-            Collection<PolicyType> types = this.policyTypes.getAll();
-            return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
-        } else {
-            Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
-            return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/policy_schema")
-    @Operation(summary = "Returns one policy type schema definition")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policy schema", //
-                    content = @Content(schema = @Schema(implementation = Object.class))),
-            @ApiResponse(responseCode = "404", //
-                    description = "The policy type is not found", //
-                    content = @Content(schema = @Schema(implementation = ErrorResponse.ErrorInfo.class)))//
-    })
-    public ResponseEntity<String> getPolicySchema( //
-            @Parameter(name = "id", required = true,
-                    description = "The identity of the policy type to get the definition for.") //
-            @RequestParam(name = "id", required = true) String id) throws EntityNotFoundException {
-        PolicyType type = policyTypes.getType(id);
-        return new ResponseEntity<>(type.getSchema(), HttpStatus.OK);
-    }
-
-    @GetMapping("/policy_types")
-    @Operation(summary = "Query policy type identities")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policy type identities", //
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class)))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Near-RT RIC is not found", //
-                    content = @Content(schema = @Schema(implementation = ErrorResponse.ErrorInfo.class)))//
-    })
-    public ResponseEntity<String> getPolicyTypes( //
-            @Parameter(name = "ric", required = false, description = "The name of the Near-RT RIC to get types for.") //
-            @RequestParam(name = "ric", required = false) String ricName) throws EntityNotFoundException {
-        if (ricName == null) {
-            Collection<PolicyType> types = this.policyTypes.getAll();
-            return new ResponseEntity<>(toPolicyTypeIdsJson(types), HttpStatus.OK);
-        } else {
-            Collection<PolicyType> types = rics.getRic(ricName).getSupportedPolicyTypes();
-            return new ResponseEntity<>(toPolicyTypeIdsJson(types), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/policy")
-    @Operation(summary = "Returns a policy configuration") //
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policy found", //
-                    content = @Content(schema = @Schema(implementation = Object.class))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Policy is not found", //
-                    content = @Content(schema = @Schema(implementation = ErrorResponse.ErrorInfo.class))//
-            )} //
-    )
-    public ResponseEntity<String> getPolicy( //
-            @Parameter(name = "id", required = true, description = "The identity of the policy instance.") //
-            @RequestParam(name = "id", required = true) String id) throws EntityNotFoundException {
-        Policy p = policies.getPolicy(id);
-        return new ResponseEntity<>(p.getJson(), HttpStatus.OK);
-    }
-
-    @DeleteMapping("/policy")
-    @Operation(summary = "Delete a policy")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Not used", //
-                    content = @Content(schema = @Schema(implementation = VoidResponse.class))),
-            @ApiResponse(responseCode = "204", //
-                    description = "Policy deleted", //
-                    content = @Content(schema = @Schema(implementation = VoidResponse.class))),
-            @ApiResponse(responseCode = "404", //
-                    description = "Policy is not found", //
-                    content = @Content(schema = @Schema(implementation = String.class))),
-            @ApiResponse(responseCode = "423", //
-                    description = "Near-RT RIC is not operational", //
-                    content = @Content(schema = @Schema(implementation = String.class)))})
-    public Mono<ResponseEntity<Object>> deletePolicy( //
-            @Parameter(name = "id", required = true, description = "The identity of the policy instance.") //
-            @RequestParam(name = "id", required = true) String id) throws EntityNotFoundException {
-        Policy policy = policies.getPolicy(id);
-        keepServiceAlive(policy.getOwnerServiceId());
-        Ric ric = policy.getRic();
-        return ric.getLock().lock(LockType.SHARED) //
-                .flatMap(notUsed -> assertRicStateIdle(ric)) //
-                .flatMap(notUsed -> a1ClientFactory.createA1Client(policy.getRic())) //
-                .doOnNext(notUsed -> policies.remove(policy)) //
-                .flatMap(client -> client.deletePolicy(policy)) //
-                .doOnNext(notUsed -> ric.getLock().unlockBlocking()) //
-                .doOnError(notUsed -> ric.getLock().unlockBlocking()) //
-                .map(notUsed -> new ResponseEntity<>(HttpStatus.NO_CONTENT)) //
-                .onErrorResume(this::handleException);
-    }
-
-    @PutMapping(path = "/policy")
-    @Operation(summary = "Put a policy")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "201", //
-                    description = "Policy created", //
-                    content = @Content(schema = @Schema(implementation = VoidResponse.class))), //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policy updated", //
-                    content = @Content(schema = @Schema(implementation = VoidResponse.class))), //
-            @ApiResponse(responseCode = "423", //
-                    description = "Near-RT RIC is not operational", //
-                    content = @Content(schema = @Schema(implementation = String.class))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Near-RT RIC or policy type is not found", //
-                    content = @Content(schema = @Schema(implementation = String.class))) //
-    })
-    public Mono<ResponseEntity<Object>> putPolicy( //
-            @Parameter(name = "type", required = false, description = "The name of the policy type.") //
-            @RequestParam(name = "type", required = false, defaultValue = "") String typeName, //
-            @Parameter(name = "id", required = true, description = "The identity of the policy instance.") //
-            @RequestParam(name = "id", required = true) String instanceId, //
-            @Parameter(name = "ric", required = true,
-                    description = "The name of the Near-RT RIC where the policy will be " + //
-                            "created.") //
-            @RequestParam(name = "ric", required = true) String ricName, //
-            @Parameter(name = "service", required = true, description = "The name of the service creating the policy.") //
-            @RequestParam(name = "service", required = true) String service, //
-            @Parameter(name = "transient", required = false,
-                    description = "If the policy is transient or not (boolean " + //
-                            "defaulted to false). A policy is transient if it will be forgotten when the service needs to "
-                            + //
-                            "reconnect to the Near-RT RIC.") //
-            @RequestParam(name = "transient", required = false, defaultValue = "false") boolean isTransient, //
-            @RequestBody Object jsonBody) {
-
-        String jsonString = gson.toJson(jsonBody);
-        Ric ric = rics.get(ricName);
-        PolicyType type = policyTypes.get(typeName);
-        keepServiceAlive(service);
-        if (ric == null || type == null) {
-            return Mono.just(new ResponseEntity<>(HttpStatus.NOT_FOUND));
-        }
-        Policy policy = Policy.builder() //
-                .id(instanceId) //
-                .json(jsonString) //
-                .type(type) //
-                .ric(ric) //
-                .ownerServiceId(service) //
-                .lastModified(Instant.now()) //
-                .isTransient(isTransient) //
-                .statusNotificationUri("") //
-                .build();
-
-        final boolean isCreate = this.policies.get(policy.getId()) == null;
-
-        return ric.getLock().lock(LockType.SHARED) //
-                .flatMap(notUsed -> assertRicStateIdle(ric)) //
-                .flatMap(notUsed -> checkSupportedType(ric, type)) //
-                .flatMap(notUsed -> validateModifiedPolicy(policy)) //
-                .flatMap(notUsed -> a1ClientFactory.createA1Client(ric)) //
-                .flatMap(client -> client.putPolicy(policy)) //
-                .doOnNext(notUsed -> policies.put(policy)) //
-                .doOnNext(notUsed -> ric.getLock().unlockBlocking()) //
-                .doOnError(trowable -> ric.getLock().unlockBlocking()) //
-                .map(notUsed -> new ResponseEntity<>(isCreate ? HttpStatus.CREATED : HttpStatus.OK)) //
-                .onErrorResume(this::handleException);
-    }
-
-    @SuppressWarnings({"unchecked"})
-    private <T> Mono<ResponseEntity<T>> createResponseEntity(String message, HttpStatus status) {
-        ResponseEntity<T> re = new ResponseEntity<>((T) message, status);
-        return Mono.just(re);
-    }
-
-    private <T> Mono<ResponseEntity<T>> handleException(Throwable throwable) {
-        if (throwable instanceof WebClientResponseException) {
-            WebClientResponseException e = (WebClientResponseException) throwable;
-            return createResponseEntity(e.getResponseBodyAsString(), e.getStatusCode());
-        } else if (throwable instanceof RejectionException) {
-            RejectionException e = (RejectionException) throwable;
-            return createResponseEntity(e.getMessage(), e.getStatus());
-        } else {
-            return createResponseEntity(throwable.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    private Mono<Object> validateModifiedPolicy(Policy policy) {
-        // Check that ric is not updated
-        Policy current = this.policies.get(policy.getId());
-        if (current != null && !current.getRic().id().equals(policy.getRic().id())) {
-            RejectionException e = new RejectionException("Policy cannot change RIC, policyId: " + current.getId() + //
-                    ", RIC name: " + current.getRic().id() + //
-                    ", new name: " + policy.getRic().id(), HttpStatus.CONFLICT);
-            logger.debug("Request rejected, {}", e.getMessage());
-            return Mono.error(e);
-        }
-        return Mono.just("OK");
-    }
-
-    private Mono<Object> checkSupportedType(Ric ric, PolicyType type) {
-        if (!ric.isSupportingType(type.getId())) {
-            logger.debug("Request rejected, type not supported, RIC: {}", ric);
-            RejectionException e = new RejectionException(
-                    "Type: " + type.getId() + " not supported by RIC: " + ric.id(), HttpStatus.NOT_FOUND);
-            return Mono.error(e);
-        }
-        return Mono.just("OK");
-    }
-
-    private Mono<Object> assertRicStateIdle(Ric ric) {
-        if (ric.getState() == Ric.RicState.AVAILABLE) {
-            return Mono.just("OK");
-        } else {
-            logger.debug("Request rejected RIC not IDLE, ric: {}", ric);
-            RejectionException e = new RejectionException(
-                    "Ric is not operational, RIC name: " + ric.id() + ", state: " + ric.getState(), HttpStatus.LOCKED);
-            return Mono.error(e);
-        }
-    }
-
-    @GetMapping("/policies")
-    @Operation(summary = "Query policies")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policies", //
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = PolicyInfo.class)))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Near-RT RIC or type not found", //
-                    content = @Content(schema = @Schema(implementation = String.class)))})
-    public ResponseEntity<String> getPolicies( //
-            @Parameter(name = "type", required = false,
-                    description = "The name of the policy type to get policies for.") //
-            @RequestParam(name = "type", required = false) String type, //
-            @Parameter(name = "ric", required = false, description = "The name of the Near-RT RIC to get policies for.") //
-            @RequestParam(name = "ric", required = false) String ric, //
-            @Parameter(name = "service", required = false, description = "The name of the service to get policies for.") //
-            @RequestParam(name = "service", required = false) String service) //
-    {
-        if ((type != null && this.policyTypes.get(type) == null)) {
-            return new ResponseEntity<>("Policy type not found", HttpStatus.NOT_FOUND);
-        }
-        if ((ric != null && this.rics.get(ric) == null)) {
-            return new ResponseEntity<>("Near-RT RIC not found", HttpStatus.NOT_FOUND);
-        }
-
-        String filteredPolicies = policiesToJson(policies.filterPolicies(type, ric, service, null));
-        return new ResponseEntity<>(filteredPolicies, HttpStatus.OK);
-    }
-
-    @GetMapping("/policy_ids")
-    @Operation(summary = "Query policies, only policy identities returned")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policy identitiess", //
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class)))),
-            @ApiResponse(responseCode = "404", //
-                    description = "Near-RT RIC or type not found", //
-                    content = @Content(schema = @Schema(implementation = String.class)))})
-    public ResponseEntity<String> getPolicyIds( //
-            @Parameter(name = "type", required = false,
-                    description = "The name of the policy type to get policies for.") //
-            @RequestParam(name = "type", required = false) String type, //
-            @Parameter(name = "ric", required = false, description = "The name of the Near-RT RIC to get policies for.") //
-            @RequestParam(name = "ric", required = false) String ric, //
-            @Parameter(name = "service", required = false, description = "The name of the service to get policies for.") //
-            @RequestParam(name = "service", required = false) String service) //
-    {
-        if ((type != null && this.policyTypes.get(type) == null)) {
-            return new ResponseEntity<>("Policy type not found", HttpStatus.NOT_FOUND);
-        }
-        if ((ric != null && this.rics.get(ric) == null)) {
-            return new ResponseEntity<>("Near-RT RIC not found", HttpStatus.NOT_FOUND);
-        }
-
-        String policyIdsJson = toPolicyIdsJson(policies.filterPolicies(type, ric, service, null));
-        return new ResponseEntity<>(policyIdsJson, HttpStatus.OK);
-    }
-
-    @GetMapping("/policy_status")
-    @Operation(summary = "Returns a policy status") //
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Policy status", //
-                    content = @Content(schema = @Schema(implementation = Object.class))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Policy is not found", //
-                    content = @Content(schema = @Schema(implementation = String.class))) //
-    })
-    public Mono<ResponseEntity<String>> getPolicyStatus( //
-            @Parameter(name = "id", required = true, description = "The identity of the policy.") @RequestParam(
-                    name = "id", //
-                    required = true) String id)
-            throws EntityNotFoundException {
-        Policy policy = policies.getPolicy(id);
-
-        return a1ClientFactory.createA1Client(policy.getRic()) //
-                .flatMap(client -> client.getPolicyStatus(policy)) //
-                .map(status -> new ResponseEntity<>(status, HttpStatus.OK)) //
-                .onErrorResume(this::handleException);
-    }
-
-    private void keepServiceAlive(String name) {
-        Service s = this.services.get(name);
-        if (s != null) {
-            s.keepAlive();
-        }
-    }
-
-    private String policiesToJson(Collection<Policy> policies) {
-        List<PolicyInfo> v = new ArrayList<>(policies.size());
-        for (Policy p : policies) {
-            PolicyInfo policyInfo = new PolicyInfo();
-            policyInfo.id = p.getId();
-            policyInfo.json = fromJson(p.getJson());
-            policyInfo.ric = p.getRic().id();
-            policyInfo.type = p.getType().getId();
-            policyInfo.service = p.getOwnerServiceId();
-            policyInfo.lastModified = p.getLastModified().toString();
-            if (!policyInfo.validate()) {
-                logger.error("BUG, all fields must be set");
-            }
-            v.add(policyInfo);
-        }
-        return gson.toJson(v);
-    }
-
-    private Object fromJson(String jsonStr) {
-        return gson.fromJson(jsonStr, Object.class);
-    }
-
-    private String toPolicyTypeSchemasJson(Collection<PolicyType> types) {
-        StringBuilder result = new StringBuilder();
-        result.append("[");
-        boolean first = true;
-        for (PolicyType t : types) {
-            if (!first) {
-                result.append(",");
-            }
-            first = false;
-            result.append(t.getSchema());
-        }
-        result.append("]");
-        return result.toString();
-    }
-
-    private String toPolicyTypeIdsJson(Collection<PolicyType> types) {
-        List<String> v = new ArrayList<>(types.size());
-        for (PolicyType t : types) {
-            v.add(t.getId());
-        }
-        return gson.toJson(v);
-    }
-
-    private String toPolicyIdsJson(Collection<Policy> policies) {
-        List<String> v = new ArrayList<>(policies.size());
-        for (Policy p : policies) {
-            v.add(p.getId());
-        }
-        return gson.toJson(v);
-    }
-
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/PolicyInfo.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/PolicyInfo.java
deleted file mode 100644
index 0e3bf513..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/PolicyInfo.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import org.immutables.gson.Gson;
-
-@Gson.TypeAdapters
-@Schema(name = "policy_info_v1")
-public class PolicyInfo {
-
-    @Schema(description = "identity of the policy")
-    public String id;
-
-    @Schema(description = "name of the policy type")
-    public String type;
-
-    @Schema(description = "identity of the target Near-RT RIC")
-    public String ric;
-
-    @Schema(description = "the configuration of the policy")
-    public Object json;
-
-    @Schema(description = "the name of the service owning the policy")
-    public String service;
-
-    @Schema(description = "timestamp, last modification time")
-    public String lastModified;
-
-    PolicyInfo() {}
-
-    public boolean validate() {
-        return id != null && type != null && ric != null && json != null && service != null && lastModified != null;
-    }
-
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/RicInfo.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/RicInfo.java
deleted file mode 100644
index b50277aa..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/RicInfo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Collection;
-
-import org.immutables.gson.Gson;
-
-@Gson.TypeAdapters
-@Schema(name = "ric_info_v1")
-class RicInfo {
-    @Schema(description = "identity of the Near-RT RIC")
-    public final String ricName;
-
-    @Schema(description = "O1 identities for managed entities")
-    public final Collection<String> managedElementIds;
-
-    @Schema(description = "supported policy types")
-    public final Collection<String> policyTypes;
-
-    @Schema(description = "state info")
-    public final String state;
-
-    RicInfo(String name, Collection<String> managedElementIds, Collection<String> policyTypes, String state) {
-        this.ricName = name;
-        this.managedElementIds = managedElementIds;
-        this.policyTypes = policyTypes;
-        this.state = state;
-    }
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/RicRepositoryController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/RicRepositoryController.java
deleted file mode 100644
index f7fdfa90..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/RicRepositoryController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.EntityNotFoundException;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyTypes;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Rics;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@Tag(name = Consts.V1_API_NAME)
-public class RicRepositoryController {
-
-    @Autowired
-    private Rics rics;
-
-    @Autowired
-    PolicyTypes types;
-
-    private static Gson gson = new GsonBuilder() //
-            .create(); //
-
-    /**
-     * Example: http://localhost:8081/rics?managedElementId=kista_1
-     * 
-     * @throws EntityNotFoundException
-     */
-    @GetMapping("/ric")
-    @Operation(summary = "Returns the name of a RIC managing one Mananged Element")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Near-RT RIC is found", //
-                    content = @Content(schema = @Schema(implementation = String.class))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Near-RT RIC is not found", //
-                    content = @Content(schema = @Schema(implementation = String.class))) //
-    })
-
-    public ResponseEntity<String> getRic( //
-            @Parameter(name = "managedElementId", required = true, description = "The identity of the Managed Element") //
-            @RequestParam(name = "managedElementId", required = true) String managedElementId)
-            throws EntityNotFoundException {
-        Ric ric = this.rics.lookupRicForManagedElement(managedElementId);
-        return new ResponseEntity<>(ric.id(), HttpStatus.OK);
-    }
-
-    /**
-     * @return a Json array of all RIC data Example: http://localhost:8081/ric
-     */
-    @GetMapping("/rics")
-    @Operation(summary = "Query Near-RT RIC information")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "OK", //
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = RicInfo.class)))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Policy type is not found", //
-                    content = @Content(schema = @Schema(implementation = String.class))) //
-    })
-    public ResponseEntity<String> getRics( //
-            @Parameter(name = "policyType", required = false, description = "The name of the policy type") //
-            @RequestParam(name = "policyType", required = false) String supportingPolicyType) {
-        if ((supportingPolicyType != null) && (this.types.get(supportingPolicyType) == null)) {
-            return new ResponseEntity<>("Policy type not found", HttpStatus.NOT_FOUND);
-        }
-
-        List<RicInfo> result = new ArrayList<>();
-        for (Ric ric : rics.getRics()) {
-            if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) {
-                result.add(new RicInfo(ric.id(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames(),
-                        ric.getState().toString()));
-            }
-        }
-
-        return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-    }
-
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceController.java
deleted file mode 100644
index 2edd1e51..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceController.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.onap.ccsdk.oran.a1policymanagementservice.controllers.VoidResponse;
-import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.ServiceException;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policies;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policy;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Service;
-import org.onap.ccsdk.oran.a1policymanagementservice.repository.Services;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@Tag(name = Consts.V1_API_NAME)
-public class ServiceController {
-
-    private final Services services;
-    private final Policies policies;
-
-    private static Gson gson = new GsonBuilder().create();
-
-    @Autowired
-    ServiceController(Services services, Policies policies) {
-        this.services = services;
-        this.policies = policies;
-    }
-
-    @GetMapping("/services")
-    @Operation(summary = "Returns service information")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "OK", //
-                    content = @Content(array = @ArraySchema(schema = @Schema(implementation = ServiceStatus.class)))), //
-            @ApiResponse(responseCode = "404", //
-                    description = "Service is not found", //
-                    content = @Content(schema = @Schema(implementation = String.class))) //
-    })
-
-    public ResponseEntity<String> getServices(//
-            @Parameter(name = "name", required = false, description = "The name of the service") //
-            @RequestParam(name = "name", required = false) String name) {
-        if (name != null && this.services.get(name) == null) {
-            return new ResponseEntity<>("Service not found", HttpStatus.NOT_FOUND);
-        }
-
-        Collection<ServiceStatus> servicesStatus = new ArrayList<>();
-        for (Service s : this.services.getAll()) {
-            if (name == null || name.equals(s.getName())) {
-                servicesStatus.add(toServiceStatus(s));
-            }
-        }
-
-        String res = gson.toJson(servicesStatus);
-        return new ResponseEntity<>(res, HttpStatus.OK);
-    }
-
-    private ServiceStatus toServiceStatus(Service s) {
-        return new ServiceStatus(s.getName(), s.getKeepAliveInterval().toSeconds(), s.timeSinceLastPing().toSeconds(),
-                s.getCallbackUrl());
-    }
-
-    private void validateRegistrationInfo(ServiceRegistrationInfo registrationInfo)
-            throws ServiceException, MalformedURLException {
-        if (registrationInfo.serviceName.isEmpty()) {
-            throw new ServiceException("Missing mandatory parameter 'serviceName'");
-        }
-        if (registrationInfo.keepAliveIntervalSeconds < 0) {
-            throw new ServiceException("Keepalive interval should be greater or equal to 0");
-        }
-        if (!registrationInfo.callbackUrl.isEmpty()) {
-            new URL(registrationInfo.callbackUrl);
-        }
-    }
-
-    @Operation(summary = "Register a service")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", //
-                    description = "Service updated", //
-                    content = @Content(schema = @Schema(implementation = String.class))), //
-            @ApiResponse(responseCode = "201", //
-                    description = "Service created", //
-                    content = @Content(schema = @Schema(implementation = String.class))), //
-            @ApiResponse(responseCode = "400", //
-                    description = "The ServiceRegistrationInfo is not accepted", //
-                    content = @Content(schema = @Schema(implementation = String.class))) //
-    })
-    @PutMapping("/service")
-    public ResponseEntity<String> putService(//
-            @RequestBody ServiceRegistrationInfo registrationInfo) {
-        try {
-            validateRegistrationInfo(registrationInfo);
-            final boolean isCreate = this.services.get(registrationInfo.serviceName) == null;
-            this.services.put(toService(registrationInfo));
-            return new ResponseEntity<>("OK", isCreate ? HttpStatus.CREATED : HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
-        }
-    }
-
-    @Operation(summary = "Unregister a service")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "204", description = "Service unregistered", //
-                    content = @Content(schema = @Schema(implementation = VoidResponse.class))),
-            @ApiResponse(responseCode = "404", description = "Service not found", //
-                    content = @Content(schema = @Schema(implementation = String.class)))})
-    @DeleteMapping("/services")
-    public ResponseEntity<String> deleteService(//
-            @Parameter(name = "name", required = true, description = "The name of the service") //
-            @RequestParam(name = "name", required = true) String serviceName) {
-        try {
-            Service service = removeService(serviceName);
-            // Remove the policies from the repo and let the consistency monitoring
-            // do the rest.
-            removePolicies(service);
-            return new ResponseEntity<>("OK", HttpStatus.NO_CONTENT);
-        } catch (Exception e) {
-            return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
-        }
-    }
-
-    @Operation(summary = "Heartbeat from a service")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", description = "Service supervision timer refreshed, OK"),
-            @ApiResponse(responseCode = "404", description = "The service is not found, needs re-registration")
-
-    })
-
-    @PutMapping("/services/keepalive")
-    public ResponseEntity<String> keepAliveService(//
-            @Parameter(name = "name", required = true, description = "The name of the service") //
-            @RequestParam(name = "name", required = true) String serviceName) {
-        try {
-            services.getService(serviceName).keepAlive();
-            return new ResponseEntity<>("OK", HttpStatus.OK);
-        } catch (ServiceException e) {
-            return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
-        }
-    }
-
-    private Service removeService(String name) throws ServiceException {
-        Service service = this.services.getService(name); // Just to verify that it exists
-        this.services.remove(service.getName());
-        return service;
-    }
-
-    private void removePolicies(Service service) {
-        Collection<Policy> policyList = this.policies.getForService(service.getName());
-        for (Policy policy : policyList) {
-            this.policies.remove(policy);
-        }
-    }
-
-    private Service toService(ServiceRegistrationInfo s) {
-        return new Service(s.serviceName, Duration.ofSeconds(s.keepAliveIntervalSeconds), s.callbackUrl);
-    }
-
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceRegistrationInfo.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceRegistrationInfo.java
deleted file mode 100644
index a4fd59a8..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceRegistrationInfo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import com.google.gson.annotations.SerializedName;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import org.immutables.gson.Gson;
-
-@Gson.TypeAdapters
-@Schema(name = "service_registration_info_v1")
-public class ServiceRegistrationInfo {
-
-    @SerializedName("serviceName")
-    public String serviceName = "";
-
-    @Schema(description = "keep alive interval for the service. This is a heartbeat supervision of the service, "
-            + "which in regular intevals must invoke a 'keepAlive' REST call. "
-            + "When a service does not invoke this call within the given time, it is considered unavailble. "
-            + "An unavailable service will be automatically deregistered and its policies will be deleted. "
-            + "Value 0 means no timeout supervision.")
-    @SerializedName("keepAliveIntervalSeconds")
-    public long keepAliveIntervalSeconds = 0;
-
-    @Schema(description = "callback for notifying of RIC synchronization")
-    @SerializedName("callbackUrl")
-    public String callbackUrl = "";
-
-    public ServiceRegistrationInfo() {}
-
-    public ServiceRegistrationInfo(String name, long keepAliveIntervalSeconds, String callbackUrl) {
-        this.serviceName = name;
-        this.keepAliveIntervalSeconds = keepAliveIntervalSeconds;
-        this.callbackUrl = callbackUrl;
-    }
-
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceStatus.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceStatus.java
deleted file mode 100644
index f3f57d8b..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/ServiceStatus.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import org.immutables.gson.Gson;
-
-@Gson.TypeAdapters
-@Schema(name = "service_status_v1")
-public class ServiceStatus {
-
-    @Schema(description = "identity of the service")
-    public final String serviceName;
-
-    @Schema(description = "policy keep alive timeout")
-    public final long keepAliveIntervalSeconds;
-
-    @Schema(description = "time since last invocation by the service")
-    public final long timeSinceLastActivitySeconds;
-
-    @Schema(description = "callback for notifying of RIC synchronization")
-    public String callbackUrl;
-
-    ServiceStatus(String name, long keepAliveIntervalSeconds, long timeSincePingSeconds, String callbackUrl) {
-        this.serviceName = name;
-        this.keepAliveIntervalSeconds = keepAliveIntervalSeconds;
-        this.timeSinceLastActivitySeconds = timeSincePingSeconds;
-        this.callbackUrl = callbackUrl;
-    }
-
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/StatusController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/StatusController.java
deleted file mode 100644
index 4dbe3b66..00000000
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v1/StatusController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * ONAP : ccsdk oran
- * ======================================================================
- * Copyright (C) 2019-2020 Nordix Foundation. 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.
- * ========================LICENSE_END===================================
- */
-
-package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v1;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Mono;
-
-@RestController
-@Tag(name = Consts.V1_API_NAME)
-public class StatusController {
-
-    @GetMapping("/status")
-    @Operation(summary = "Returns status and statistics of this service")
-    @ApiResponses(value = { //
-            @ApiResponse(responseCode = "200", description = "Service is living",
-                    content = @Content(schema = @Schema(implementation = String.class))) //
-    })
-
-    public Mono<ResponseEntity<String>> getStatus() {
-        return Mono.just(new ResponseEntity<>("hunky dory", HttpStatus.OK));
-    }
-
-}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java
index 2318d55d..cbdde961 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/StatusController.java
@@ -66,4 +66,15 @@ public class StatusController {
         return Mono.just(new ResponseEntity<>(info, HttpStatus.OK));
     }
 
+    @GetMapping("/status")
+    @Operation(summary = "Returns status and statistics of this service")
+    @ApiResponses(value = { //
+            @ApiResponse(responseCode = "200", description = "Service is living",
+                    content = @Content(schema = @Schema(implementation = String.class))) //
+    })
+
+    public Mono<ResponseEntity<String>> getStatusV1() {
+        return Mono.just(new ResponseEntity<>("hunky dory", HttpStatus.OK));
+    }
+
 }