From: PatrikBuhr Date: Fri, 5 Aug 2022 06:43:51 +0000 (+0200) Subject: Bugfix X-Git-Tag: 1.4.0~11 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=6f1351856d53f2d11ed15430f3f6ec0cadd71cc9;p=nonrtric%2Fplt%2Finformationcoordinatorservice.git Bugfix Missing app.auth-token-file in application.yaml would not default to an empty string. Formatting Signed-off-by: PatrikBuhr Issue-ID: NONRTRIC-743 Change-Id: Ic30d29b5720d4e2a81664712526ec1fdea6e512d --- diff --git a/pom.xml b/pom.xml index 52fde2a..7451773 100644 --- a/pom.xml +++ b/pom.xml @@ -60,12 +60,7 @@ 0.8.5 true - - - org.springdoc - springdoc-openapi-ui - 1.6.6 - + org.springframework.boot spring-boot-starter-web @@ -141,6 +136,12 @@ true + + org.springdoc + springdoc-openapi-ui + 1.6.6 + test + org.springframework.boot spring-boot-starter-test diff --git a/src/main/java/org/oransc/ics/clients/SecurityContext.java b/src/main/java/org/oransc/ics/clients/SecurityContext.java index aadc1bf..f11b669 100644 --- a/src/main/java/org/oransc/ics/clients/SecurityContext.java +++ b/src/main/java/org/oransc/ics/clients/SecurityContext.java @@ -47,7 +47,7 @@ public class SecurityContext { @Setter private Path authTokenFilePath; - public SecurityContext(@Value("${app.auth-token-file:\"\"}") String authTokenFilename) { + public SecurityContext(@Value("${app.auth-token-file:}") String authTokenFilename) { if (!authTokenFilename.isEmpty()) { this.authTokenFilePath = Path.of(authTokenFilename); } @@ -63,7 +63,7 @@ public class SecurityContext { } try { long lastModified = authTokenFilePath.toFile().lastModified(); - if (lastModified != this.tokenTimestamp) { + if (tokenTimestamp == 0 || lastModified != this.tokenTimestamp) { this.authToken = Files.readString(authTokenFilePath); this.tokenTimestamp = lastModified; } diff --git a/src/main/java/org/oransc/ics/configuration/ApplicationConfig.java b/src/main/java/org/oransc/ics/configuration/ApplicationConfig.java index f076789..50c6daa 100644 --- a/src/main/java/org/oransc/ics/configuration/ApplicationConfig.java +++ b/src/main/java/org/oransc/ics/configuration/ApplicationConfig.java @@ -60,7 +60,7 @@ public class ApplicationConfig { @Value("${app.webclient.trust-store}") private String sslTrustStore = ""; - @Value("${app.webclient.http.proxy-host:\"\"}") + @Value("${app.webclient.http.proxy-host:}") private String httpProxyHost = ""; @Value("${app.webclient.http.proxy-port:0}") diff --git a/src/main/java/org/oransc/ics/controllers/VoidResponse.java b/src/main/java/org/oransc/ics/controllers/VoidResponse.java index 4f69a7a..e369acd 100644 --- a/src/main/java/org/oransc/ics/controllers/VoidResponse.java +++ b/src/main/java/org/oransc/ics/controllers/VoidResponse.java @@ -22,7 +22,6 @@ package org.oransc.ics.controllers; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "Void", description = "Void/empty ") public class VoidResponse { private VoidResponse() { diff --git a/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobStatus.java b/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobStatus.java index 1f22e9a..e635f2e 100644 --- a/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobStatus.java +++ b/src/main/java/org/oransc/ics/controllers/a1e/A1eEiJobStatus.java @@ -25,7 +25,6 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "EiJobStatusObject", description = "Status for an EI job") public class A1eEiJobStatus { diff --git a/src/main/java/org/oransc/ics/controllers/a1e/A1eEiTypeInfo.java b/src/main/java/org/oransc/ics/controllers/a1e/A1eEiTypeInfo.java index eac18f3..edf7297 100644 --- a/src/main/java/org/oransc/ics/controllers/a1e/A1eEiTypeInfo.java +++ b/src/main/java/org/oransc/ics/controllers/a1e/A1eEiTypeInfo.java @@ -22,7 +22,6 @@ package org.oransc.ics.controllers.a1e; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "EiTypeObject", description = "Information for an EI type") public class A1eEiTypeInfo { diff --git a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerInfoTypeInfo.java b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerInfoTypeInfo.java index cce345c..1f11c15 100644 --- a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerInfoTypeInfo.java +++ b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerInfoTypeInfo.java @@ -25,7 +25,6 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "consumer_information_type", description = "Information for an Information type") public class ConsumerInfoTypeInfo { diff --git a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobInfo.java b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobInfo.java index 696e827..7babf87 100644 --- a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobInfo.java +++ b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobInfo.java @@ -25,7 +25,6 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "consumer_job", description = "Information for an Information Job") public class ConsumerJobInfo { diff --git a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobStatus.java b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobStatus.java index 715f88f..78657fd 100644 --- a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobStatus.java +++ b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerJobStatus.java @@ -27,7 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.Collection; - @Schema(name = "consumer_job_status", description = "Status for an Information Job") public class ConsumerJobStatus { diff --git a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeRegistrationInfo.java b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeRegistrationInfo.java index f3010c9..fa4ea99 100644 --- a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeRegistrationInfo.java +++ b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeRegistrationInfo.java @@ -25,7 +25,6 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "consumer_type_registration_info", description = "Information for an Information type") public class ConsumerTypeRegistrationInfo { diff --git a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java index fc8fc24..84e8e9d 100644 --- a/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java +++ b/src/main/java/org/oransc/ics/controllers/r1consumer/ConsumerTypeSubscriptionInfo.java @@ -26,7 +26,6 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; - @EqualsAndHashCode @Schema(name = "consumer_type_subscription_info", description = "Information for an information type subscription") public class ConsumerTypeSubscriptionInfo { diff --git a/src/main/java/org/oransc/ics/controllers/r1producer/ProducerInfoTypeInfo.java b/src/main/java/org/oransc/ics/controllers/r1producer/ProducerInfoTypeInfo.java index beca34a..45c5a93 100644 --- a/src/main/java/org/oransc/ics/controllers/r1producer/ProducerInfoTypeInfo.java +++ b/src/main/java/org/oransc/ics/controllers/r1producer/ProducerInfoTypeInfo.java @@ -25,7 +25,6 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "producer_info_type_info", description = "Information for an Information Type") public class ProducerInfoTypeInfo { diff --git a/src/main/java/org/oransc/ics/controllers/r1producer/ProducerRegistrationInfo.java b/src/main/java/org/oransc/ics/controllers/r1producer/ProducerRegistrationInfo.java index 3493bad..ee82546 100644 --- a/src/main/java/org/oransc/ics/controllers/r1producer/ProducerRegistrationInfo.java +++ b/src/main/java/org/oransc/ics/controllers/r1producer/ProducerRegistrationInfo.java @@ -27,7 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.Collection; - @Schema(name = "producer_registration_info", description = "Information for an Information Producer") public class ProducerRegistrationInfo { diff --git a/src/main/java/org/oransc/ics/controllers/r1producer/ProducerStatusInfo.java b/src/main/java/org/oransc/ics/controllers/r1producer/ProducerStatusInfo.java index c29af8f..9a04023 100644 --- a/src/main/java/org/oransc/ics/controllers/r1producer/ProducerStatusInfo.java +++ b/src/main/java/org/oransc/ics/controllers/r1producer/ProducerStatusInfo.java @@ -25,7 +25,6 @@ import com.google.gson.annotations.SerializedName; import io.swagger.v3.oas.annotations.media.Schema; - @Schema(name = "producer_status", description = "Status for an Info Producer") public class ProducerStatusInfo { diff --git a/src/test/java/org/oransc/ics/MockInformationService.java b/src/test/java/org/oransc/ics/MockInformationService.java index 65c19a8..fc21315 100644 --- a/src/test/java/org/oransc/ics/MockInformationService.java +++ b/src/test/java/org/oransc/ics/MockInformationService.java @@ -21,16 +21,13 @@ package org.oransc.ics; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit.jupiter.SpringExtension; -@ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT) @TestPropertySource( properties = { //