Remove AAF references from pap

Issue-ID: POLICY-4592
Change-Id: Id0d954f81e48d1464d71b37d853e74fc90b6fbeb
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/main/src/main/java/org/onap/policy/pap/main/config/PapAafConfig.java b/main/src/main/java/org/onap/policy/pap/main/config/PapAafConfig.java
deleted file mode 100644 (file)
index f60728f..0000000
--- a/main/src/main/java/org/onap/policy/pap/main/config/PapAafConfig.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2021-2022 Bell Canada. All rights reserved.
- *  Modifications Copyright (C) 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.
- * 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.policy.pap.main.config;
-
-import jakarta.servlet.Filter;
-import org.onap.policy.pap.main.rest.PapAafFilter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConditionalOnProperty(value = "pap.aaf", havingValue = "true")
-public class PapAafConfig {
-
-    /**
-     * Method to return Pap Aaf filter.
-     *
-     * @return Filter papAafFilter
-     */
-    @Bean
-    public Filter papAafFilter() {
-        return new PapAafFilter();
-    }
-}

diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PapAafFilter.java b/main/src/main/java/org/onap/policy/pap/main/rest/PapAafFilter.java
deleted file mode 100644 (file)
index 990d15e..0000000
--- a/main/src/main/java/org/onap/policy/pap/main/rest/PapAafFilter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 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.policy.pap.main.rest;
-
-import org.onap.policy.common.endpoints.http.server.aaf.AafGranularAuthFilter;
-
-/**
- * Class to manage aaf filters for PAP component.
- *
- * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
- */
-public class PapAafFilter extends AafGranularAuthFilter {
-
-    public static final String AAF_NODETYPE = "policy-pap";
-    public static final String AAF_ROOT_PERMISSION = DEFAULT_NAMESPACE + "." + AAF_NODETYPE;
-
-    @Override
-    public String getPermissionTypeRoot() {
-        return AAF_ROOT_PERMISSION;
-    }
-}

diff --git a/main/src/main/resources/application.yaml b/main/src/main/resources/application.yaml
index 704306b..2a3d162 100644 (file)
--- a/main/src/main/resources/application.yaml
+++ b/main/src/main/resources/application.yaml
@@ -3,9 +3,6 @@ spring:
     user:
       name: policyadmin
       password: zb!XztG34
-  http:
-    converters:
-      preferred-json-mapper: gson
   datasource:
     url: jdbc:mariadb://mariadb:3306/policyadmin
     driverClassName: org.mariadb.jdbc.Driver
@@ -20,6 +17,9 @@ spring:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
         implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
+  mvc:
+    converters:
+      preferred-json-mapper: gson
 
 server:
   port: 6969
@@ -27,7 +27,6 @@ server:
     context-path: /policy/pap/v1
 pap:
   name: PapGroup
-  aaf: false
   topic:
     pdp-pap.name: POLICY-PDP-PAP
     notification.name: POLICY-NOTIFICATION

diff --git a/main/src/test/resources/application-test-e2e.yaml b/main/src/test/resources/application-test-e2e.yaml
index a4afd3e..23920f1 100644 (file)
--- a/main/src/test/resources/application-test-e2e.yaml
+++ b/main/src/test/resources/application-test-e2e.yaml
@@ -14,7 +14,6 @@ spring:
 
 pap:
   name: "PapGroupE2E"
-  aaf: false
   topic:
     pdp-pap.name: pdp-pap-topic
     notification.name: notification-topic

diff --git a/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml b/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml
index a1ed00e..af230ff 100644 (file)
--- a/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml
+++ b/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml
@@ -28,7 +28,6 @@ server:
 
 pap:
   name: PapGroup
-  aaf: false
   pdpParameters:
     heartBeatMs: 120000
     updateParameters: