From c6cca20e3fd10842be0ca782d143dfa59d5c086e Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Tue, 4 Jan 2022 17:10:12 +0100 Subject: A1 Policy Management Prepare to step springboot fwk to version 2.6.2 Adding a log statement Issue-ID: CCSDK-3495 Signed-off-by: PatrikBuhr Change-Id: I33fcba31de2ffc259d3366056f979141816f0fb2 --- a1-policy-management/api/pms-api.json | 33 +++++++++++----------- a1-policy-management/api/pms-api.yaml | 33 +++++++++++----------- a1-policy-management/pom.xml | 4 +-- .../repository/PolicyType.java | 7 +++++ 4 files changed, 43 insertions(+), 34 deletions(-) (limited to 'a1-policy-management') diff --git a/a1-policy-management/api/pms-api.json b/a1-policy-management/api/pms-api.json index 0ba147bb..f3d64af2 100644 --- a/a1-policy-management/api/pms-api.json +++ b/a1-policy-management/api/pms-api.json @@ -429,7 +429,7 @@ }}, "/actuator/threaddump": {"get": { "summary": "Actuator web endpoint 'threaddump'", - "operationId": "handle_2_1_3", + "operationId": "threaddump_4", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -519,7 +519,7 @@ }}, "/actuator/loggers": {"get": { "summary": "Actuator web endpoint 'loggers'", - "operationId": "handle_6", + "operationId": "loggers_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -528,7 +528,7 @@ }}, "/actuator/health/**": {"get": { "summary": "Actuator web endpoint 'health-path'", - "operationId": "handle_12", + "operationId": "health-path_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -627,7 +627,7 @@ }, "/actuator/metrics/{requiredMetricName}": {"get": { "summary": "Actuator web endpoint 'metrics-requiredMetricName'", - "operationId": "handle_5", + "operationId": "metrics-requiredMetricName_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -865,7 +865,7 @@ "/actuator/loggers/{name}": { "post": { "summary": "Actuator web endpoint 'loggers-name'", - "operationId": "handle_0", + "operationId": "loggers-name_3", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -880,7 +880,7 @@ }, "get": { "summary": "Actuator web endpoint 'loggers-name'", - "operationId": "handle_7", + "operationId": "loggers-name_4", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -965,7 +965,7 @@ }}, "/actuator/metrics": {"get": { "summary": "Actuator web endpoint 'metrics'", - "operationId": "handle_4", + "operationId": "metrics_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -1134,7 +1134,7 @@ }, "/actuator/info": {"get": { "summary": "Actuator web endpoint 'info'", - "operationId": "handle_9", + "operationId": "info_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -1217,7 +1217,7 @@ }}, "/actuator/logfile": {"get": { "summary": "Actuator web endpoint 'logfile'", - "operationId": "handle_8", + "operationId": "logfile_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -1226,7 +1226,7 @@ }}, "/actuator/health": {"get": { "summary": "Actuator web endpoint 'health'", - "operationId": "handle_11", + "operationId": "health_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -1393,7 +1393,7 @@ }}, "/actuator/heapdump": {"get": { "summary": "Actuator web endpoint 'heapdump'", - "operationId": "handle_10", + "operationId": "heapdump_2", "responses": {"200": { "description": "OK", "content": {"*/*": {"schema": {"type": "object"}}} @@ -1411,16 +1411,17 @@ "version": "1.1.0" }, "tags": [ + {"name": "Service Registry and Supervision"}, + {"name": "A1 Policy Management"}, + {"name": "A1 Policy Management V1.0"}, + {"name": "NearRT-RIC Repository"}, + {"name": "Callbacks"}, + {"name": "Health Check"}, { "name": "A1 Policy Management V1.0", "description": "(deprecated primitves)" }, {"name": "Management of configuration"}, - {"name": "A1 Policy Management"}, - {"name": "NearRT-RIC Repository"}, - {"name": "Service Registry and Supervision"}, - {"name": "Health Check"}, - {"name": "Callbacks"}, { "name": "Actuator", "description": "Monitor and interact", diff --git a/a1-policy-management/api/pms-api.yaml b/a1-policy-management/api/pms-api.yaml index 9aa945e4..453c4b1d 100644 --- a/a1-policy-management/api/pms-api.yaml +++ b/a1-policy-management/api/pms-api.yaml @@ -27,14 +27,15 @@ info: servers: - url: / tags: -- name: A1 Policy Management V1.0 - description: (deprecated primitves) -- name: Management of configuration +- name: Service Registry and Supervision - name: A1 Policy Management +- name: A1 Policy Management V1.0 - name: NearRT-RIC Repository -- name: Service Registry and Supervision -- name: Health Check - name: Callbacks +- name: Health Check +- name: A1 Policy Management V1.0 + description: (deprecated primitves) +- name: Management of configuration - name: Actuator description: Monitor and interact externalDocs: @@ -145,7 +146,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'threaddump' - operationId: handle_2_1_3 + operationId: threaddump_4 responses: 200: description: OK @@ -255,7 +256,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'loggers' - operationId: handle_6 + operationId: loggers_2 responses: 200: description: OK @@ -268,7 +269,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'health-path' - operationId: handle_12 + operationId: health-path_2 responses: 200: description: OK @@ -394,7 +395,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'metrics-requiredMetricName' - operationId: handle_5 + operationId: metrics-requiredMetricName_2 parameters: - name: requiredMetricName in: path @@ -678,7 +679,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'loggers-name' - operationId: handle_7 + operationId: loggers-name_4 parameters: - name: name in: path @@ -698,7 +699,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'loggers-name' - operationId: handle_0 + operationId: loggers-name_3 parameters: - name: name in: path @@ -807,7 +808,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'metrics' - operationId: handle_4 + operationId: metrics_2 responses: 200: description: OK @@ -1018,7 +1019,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'info' - operationId: handle_9 + operationId: info_2 responses: 200: description: OK @@ -1127,7 +1128,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'logfile' - operationId: handle_8 + operationId: logfile_2 responses: 200: description: OK @@ -1140,7 +1141,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'health' - operationId: handle_11 + operationId: health_2 responses: 200: description: OK @@ -1356,7 +1357,7 @@ paths: tags: - Actuator summary: Actuator web endpoint 'heapdump' - operationId: handle_10 + operationId: heapdump_2 responses: 200: description: OK diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml index cade2512..c7506b01 100644 --- a/a1-policy-management/pom.xml +++ b/a1-policy-management/pom.xml @@ -41,7 +41,7 @@ 20200518 2.13.0 2.5.0 - 2.5 + 2.11.0 0.30.0 3.0.0-M5 @@ -54,7 +54,7 @@ org.springdoc springdoc-openapi-ui - 1.5.4 + 1.6.3 org.springframework.boot diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/PolicyType.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/PolicyType.java index 14c9f580..56f0c2a8 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/PolicyType.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/PolicyType.java @@ -20,14 +20,20 @@ package org.onap.ccsdk.oran.a1policymanagementservice.repository; +import java.lang.invoke.MethodHandles; + import lombok.Builder; import lombok.Getter; import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.ServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @Builder public class PolicyType { + private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + @Getter private String id; @Getter @@ -114,6 +120,7 @@ public class PolicyType { try { return Version.ofString(getTypeId().getVersion()); } catch (ServiceException e) { + logger.warn("Not possible to get version from policy type ID {}, {}", getId(), e.getMessage()); return new Version(0, 0, 0); } } -- cgit 1.2.3-korg