diff options
5 files changed, 2 insertions, 116 deletions
diff --git a/main/src/main/java/org/onap/policy/api/main/config/PolicyApiAafConfig.java b/main/src/main/java/org/onap/policy/api/main/config/PolicyApiAafConfig.java deleted file mode 100644 index 2d0a2285..00000000 --- a/main/src/main/java/org/onap/policy/api/main/config/PolicyApiAafConfig.java +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 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.api.main.config; - -import jakarta.servlet.Filter; -import org.onap.policy.api.main.rest.aaf.AafApiFilter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConditionalOnProperty(value = "policy-api.aaf", havingValue = "true") -public class PolicyApiAafConfig { - - @Bean - public Filter aafFilter() { - return new AafApiFilter(); - } -} diff --git a/main/src/main/java/org/onap/policy/api/main/rest/aaf/AafApiFilter.java b/main/src/main/java/org/onap/policy/api/main/rest/aaf/AafApiFilter.java deleted file mode 100644 index dea12ee7..00000000 --- a/main/src/main/java/org/onap/policy/api/main/rest/aaf/AafApiFilter.java +++ /dev/null @@ -1,39 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy API - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. 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.policy.api.main.rest.aaf; - -import org.onap.policy.common.endpoints.http.server.aaf.AafGranularAuthFilter; - -/** - * Api AAF authorization filter. - */ -public class AafApiFilter extends AafGranularAuthFilter { - - public static final String AAF_NODETYPE = "policy-api"; - 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/META-INF/persistence.xml b/main/src/main/resources/META-INF/persistence.xml index 8adb850c..93eafbe3 100644 --- a/main/src/main/resources/META-INF/persistence.xml +++ b/main/src/main/resources/META-INF/persistence.xml @@ -27,7 +27,7 @@ <persistence-unit name="PolicyDb" transaction-type="RESOURCE_LOCAL"> - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> + <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider> <class>org.onap.policy.models.base.PfConceptKey</class> <class>org.onap.policy.models.dao.converters.CDataConditioner</class> @@ -62,7 +62,7 @@ <properties> <property name="jakarta.persistence.schema-generation.database.action" value="none" /> - <property name="eclipselink.ddl-generation" value="none" /> + <property name="hibernate.hbm2ddl.auto" value="validate" /> <property name="eclipselink.logging.level" value="WARNING" /> </properties> </persistence-unit> diff --git a/main/src/main/resources/application.yaml b/main/src/main/resources/application.yaml index 42e0025b..32b1c9ca 100644 --- a/main/src/main/resources/application.yaml +++ b/main/src/main/resources/application.yaml @@ -27,7 +27,6 @@ server: policy-api: name: ApiGroup - aaf: false policy-preload: policyTypes: diff --git a/main/src/test/java/org/onap/policy/api/main/rest/aaf/TestAafApiFilter.java b/main/src/test/java/org/onap/policy/api/main/rest/aaf/TestAafApiFilter.java deleted file mode 100644 index 7246cddd..00000000 --- a/main/src/test/java/org/onap/policy/api/main/rest/aaf/TestAafApiFilter.java +++ /dev/null @@ -1,36 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy API - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. 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.api.main.rest.aaf; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -class TestAafApiFilter { - private final AafApiFilter aafApiFilter = new AafApiFilter(); - - @Test - void testGetPermissionTypeRoot() { - Assertions.assertEquals("org.onap.policy.policy-api", aafApiFilter.getPermissionTypeRoot()); - } -} |