Updated the spoless maven plugin version and re-run the code formatting.
Re-generate the API documentation.
No changes.
Issue-ID: CCSDK-3883
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I95e88ebbd144b37bc1f7ca3b722bfc748e5ae801
"example": false
},
"service_id": {
- "description": "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registerred.",
+ "description": "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registered.",
"type": "string"
},
"policy_data": {
service_id:
description: the identity of the service owning the policy. This can be
used to group the policies (it is possible to get all policies associated
- to a service). Note that the service does not need to be registerred.
+ to a service). Note that the service does not need to be registered.
type: string
policy_data:
description: the configuration of the policy
},
"service_id" : {
"type" : "string",
- "description" : "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registerred."
+ "description" : "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registered."
},
"policy_data" : {
"type" : "object",
~ ============LICENSE_END=======================================================
~
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-30-starter-parent</artifactId>
<version>2.5.4</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.onap.ccsdk.oran</groupId>
<artifactId>a1-policy-management-service</artifactId>
<java.version.target>17</java.version.target>
<gson.version>2.10.1</gson.version>
<json.version>20220924</json.version>
- <formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
- <spotless-maven-plugin.version>1.24.3</spotless-maven-plugin.version>
+ <formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
+ <spotless-maven-plugin.version>2.35.0</spotless-maven-plugin.version>
<commons-io.version>2.11.0</commons-io.version>
<guava.version>31.0.1-jre</guava.version>
<springdoc.version>2.0.2</springdoc.version>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
- <dependency>
+ <dependency>
<!-- May be possible to remove this later when ccsdk parent bom stabilizes -->
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<configuration>
<lineEndings>UNIX</lineEndings>
<java>
- <removeUnusedImports/>
+ <removeUnusedImports />
<importOrder>
- <order>com,java,javax,org</order>
+ <order>com,io,java,lombok,javax,org,reactor</order>
</importOrder>
</java>
</configuration>
<version>${surefire-maven-plugin.version}</version>
<configuration>
<skipTests>${allowskiptests}</skipTests>
- <statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
+ <statelessTestsetReporter
+ implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
<usePhrasedFileName>false</usePhrasedFileName>
<usePhrasedTestSuiteClassName>true</usePhrasedTestSuiteClassName>
<usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
<usePhrasedTestCaseMethodName>true</usePhrasedTestCaseMethodName>
</statelessTestsetReporter>
- <consoleOutputReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5ConsoleOutputReporter">
+ <consoleOutputReporter
+ implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5ConsoleOutputReporter">
<usePhrasedFileName>false</usePhrasedFileName>
</consoleOutputReporter>
- <statelessTestsetInfoReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoReporter">
+ <statelessTestsetInfoReporter
+ implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoReporter">
<usePhrasedFileName>false</usePhrasedFileName>
<usePhrasedClassNameInRunning>true</usePhrasedClassNameInRunning>
<usePhrasedClassNameInTestCaseSummary>true</usePhrasedClassNameInTestCaseSummary>
<skipOperationExample>false</skipOperationExample>
<strictSpec>false</strictSpec>
<configOptions>
- <appDescription>The O-RAN Non-RT RIC Policy Management Service provides a REST API for managing O-RAN A1 Policies.</appDescription>
+ <appDescription>The O-RAN Non-RT RIC Policy Management Service
+ provides a REST API for managing O-RAN A1 Policies.</appDescription>
<appName>ONAP CCSDK A1 Policy Management Service</appName>
<infoUrl>https://wiki.onap.org/display/DW/O-RAN+A1+Policies+in+ONAP</infoUrl>
- <licenseInfo>Copyright (C) 2020-2023 Nordix Foundation. Licensed under the Apache License.</licenseInfo>
+ <licenseInfo>Copyright (C) 2020-2023 Nordix Foundation. Licensed
+ under the Apache License.</licenseInfo>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
</configOptions>
</configuration>
</goals>
<configuration>
<verbose>true</verbose>
- <outputDirectory>${project.basedir}/../docs/offeredapis/openapitoolgen/offeredapis/pms-api</outputDirectory>
+ <outputDirectory>
+ ${project.basedir}/../docs/offeredapis/openapitoolgen/offeredapis/pms-api</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/api/pms-api</directory>
<configuration>
<images>
<image>
- <name>onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
+ <name>
+ onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
<build>
<cleanup>try</cleanup>
<contextDir>${basedir}</contextDir>
<configuration>
<images>
<image>
- <name>onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
+ <name>
+ onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
<build>
<contextDir>${basedir}</contextDir>
<dockerFile>Dockerfile</dockerFile>
</plugin>
</plugins>
</reporting>
-</project>
+</project>
\ No newline at end of file
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import reactor.core.publisher.Mono;
/**
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
+
import reactor.netty.transport.ProxyProvider;
@Builder
import org.springframework.http.HttpStatusCode;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
+
import reactor.core.publisher.Mono;
public class ErrorResponse {
--- /dev/null
+/*-
+ * ========================LICENSE_START=================================
+ * ONAP : ccsdk oran
+ * ======================================================================
+ * Copyright (C) 2022 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.v2;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Builder;
+import lombok.Getter;
+
+
+@Schema(name = "policy_authorization", description = "Authorization request for A1 policy requests")
+@Builder
+public class PolicyAuthorizationRequest {
+
+ @Schema(name = "acces_type", description = "Access type")
+ public enum AccessType {
+ READ, WRITE, DELETE
+ }
+
+ @Schema(name = "access_type", description = "Access type", required = true)
+ @JsonProperty(value = "access_type", required = true)
+ @SerializedName("access_type")
+ @Getter
+ private String accessType;
+
+}
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.reactive.function.client.WebClientException;
import org.springframework.web.reactive.function.client.WebClientResponseException;
+
import reactor.core.publisher.Mono;
@RestController("PolicyControllerV2")
+ " This can be used to group the policies (it is possible to get all policies associated to a service)."
+ " Note that the service does not need to be registered.";
- @Schema(name = "service_id", description = SERVICE_ID_DESCRIPTION, requiredMode = RequiredMode.NOT_REQUIRED, defaultValue = "")
+ @Schema(name = "service_id", description = SERVICE_ID_DESCRIPTION, requiredMode = RequiredMode.NOT_REQUIRED,
+ defaultValue = "")
@JsonProperty(value = "service_id", required = false)
@SerializedName("service_id")
public String serviceId = "";
@SerializedName("transient")
public boolean isTransient = false;
- @Schema(name = "status_notification_uri", description = "Callback URI for policy status updates", requiredMode = RequiredMode.NOT_REQUIRED,
- defaultValue = "")
+ @Schema(name = "status_notification_uri", description = "Callback URI for policy status updates",
+ requiredMode = RequiredMode.NOT_REQUIRED, defaultValue = "")
@JsonProperty(value = "status_notification_uri", required = false)
@SerializedName("status_notification_uri")
public String statusNotificationUri = "";
UNAVAILABLE, AVAILABLE, SYNCHRONIZING, CONSISTENCY_CHECK
}
- private static final String STATE_DESCRIPTION = """
- State for the Near-RT RIC, values:
- UNAVAILABLE: The Near-RT RIC is not available, information may be inconsistent
- AVAILABLE: The normal state. Policies can be configured.
- SYNCHRONIZING: The Policy Management Service is synchronizing the view of the Near-RT RIC. Policies cannot be configured.
- CONSISTENCY_CHECK: A consistency check between the Policy Management Service and the Near-RT RIC. Policies cannot be configured.""";
+ private static final String STATE_DESCRIPTION =
+ """
+ State for the Near-RT RIC, values:
+ UNAVAILABLE: The Near-RT RIC is not available, information may be inconsistent
+ AVAILABLE: The normal state. Policies can be configured.
+ SYNCHRONIZING: The Policy Management Service is synchronizing the view of the Near-RT RIC. Policies cannot be configured.
+ CONSISTENCY_CHECK: A consistency check between the Policy Management Service and the Near-RT RIC. Policies cannot be configured.""";
@Schema(description = "identity of the Near-RT RIC")
@SerializedName("ric_id")
@JsonProperty("keep_alive_interval_seconds")
public long keepAliveIntervalSeconds = 0;
- @Schema(description = "callback for notifying of Near-RT RIC state changes", requiredMode = RequiredMode.NOT_REQUIRED, defaultValue = "")
+ @Schema(description = "callback for notifying of Near-RT RIC state changes",
+ requiredMode = RequiredMode.NOT_REQUIRED, defaultValue = "")
@SerializedName("callback_url")
@JsonProperty("callback_url")
public String callbackUrl = "";
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("StatusControllerV2")
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
+
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.BytesWrapper;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.read.ListAppender;
-
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.junit.jupiter.api.DisplayName;
import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.ccsdk.oran.a1policymanagementservice.utils.LoggingUtils;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+
@ExtendWith(MockitoExtension.class)
class LogAspectTest {
@Mock
import java.io.IOException;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import reactor.test.StepVerifier;
import reactor.util.Loggers;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+
class AsyncRestClientTest {
private static final String BASE_URL = "BaseUrl";
private static final String REQUEST_URL = "/test";
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.read.ListAppender;
-
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.ccsdk.oran.a1policymanagementservice.utils.LoggingUtils;
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+
@ExtendWith(MockitoExtension.class)
class ConfigurationFileTest {
@Mock
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Rics;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Services;
+
import reactor.test.StepVerifier;
@ExtendWith(MockitoExtension.class)
verify(refreshTaskUnderTest.rics, times(2)).put(any(Ric.class));
java.util.Collection<RicConfig> ricConfigs = appConfig.getRicConfigs();
- assertThat(ricConfigs)
- .isNotNull()
- .hasSize(2);
+ assertThat(ricConfigs).isNotNull().hasSize(2);
}
@Test
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric.RicState;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Rics;
+
import reactor.core.publisher.Mono;
@ExtendWith(MockitoExtension.class)
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.read.ListAppender;
-
import java.time.Duration;
import java.time.Instant;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Service;
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Services;
import org.onap.ccsdk.oran.a1policymanagementservice.utils.LoggingUtils;
+
import reactor.core.publisher.Mono;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+
@ExtendWith(MockitoExtension.class)
class ServiceSupervisionTest {
package org.onap.ccsdk.oran.a1policymanagementservice.utils;
+import org.slf4j.LoggerFactory;
+
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
-import org.slf4j.LoggerFactory;
-
public class LoggingUtils {
/**
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import reactor.core.publisher.Mono;
public class MockA1ClientFactory extends A1ClientFactory {
},
"service_id" : {
"type" : "string",
- "description" : "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registerred."
+ "description" : "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registered."
},
"policy_data" : {
"type" : "object",
"example": false
},
"service_id": {
- "description": "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registerred.",
+ "description": "the identity of the service owning the policy. This can be used to group the policies (it is possible to get all policies associated to a service). Note that the service does not need to be registered.",
"type": "string"
},
"policy_data": {
service_id:
description: the identity of the service owning the policy. This can be
used to group the policies (it is possible to get all policies associated
- to a service). Note that the service does not need to be registerred.
+ to a service). Note that the service does not need to be registered.
type: string
policy_data:
description: the configuration of the policy
Code Review / ccsdk / oran.git / commitdiff