From a3081ccc25cea20993e1537a8f64030944de6419 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Mon, 22 May 2023 13:03:37 +0200 Subject: [PATCH] Rename swagger to openapi in configuration Rename swagger to openapi in configuration so that it can be renamed in readme files and in parameters/variables after JIRA: LIGHTY-225 Signed-off-by: tobias.pobocik --- .../example-config/configuration.json | 2 +- .../helm/lighty-rnc-app-helm/templates/configmaps.yaml | 2 +- .../helm/lighty-rnc-app-helm/values.yaml | 2 +- .../applications/rnc/module/RncLightyModule.java | 4 ++-- .../io/lighty/applications/rnc/module/OpenApiTest.java | 2 +- .../{swagger_config.json => openapi_config.json} | 2 +- .../io/lighty/server/config/LightyServerConfig.java | 10 +++++----- .../src/test/resources/httpsConfig.json | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/{swagger_config.json => openapi_config.json} (99%) diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json index 6c91402e33..0546615ee9 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json @@ -63,7 +63,7 @@ "keyStoreFilePath":"keystore/lightyio.jks", "trustKeyStorePassword":"8pgETwat", "trustKeyStoreFilePath":"keystore/lightyio.jks", - "enableSwagger": false + "enableOpenApi": false }, "netconf-northbound":{ "connectionTimeout":20000, diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml index afb059a118..cc0564f242 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml @@ -71,7 +71,7 @@ data: "keyStoreFilePath": "{{ .Values.lighty.server.keyStoreDirectory }}/{{ .Values.lighty.server.keyStoreFileName }}", "trustKeyStorePassword": {{ .Values.lighty.server.trustKeyStorePassword | quote }}, "trustKeyStoreFilePath": "{{ .Values.lighty.server.trustKeyStoreDirectory }}/{{ .Values.lighty.server.trustKeyStoreFileName }}", - "enableSwagger": {{ .Values.lighty.server.enableSwagger }} + "enableOpenApi": {{ .Values.lighty.server.enableOpenApi }} }, "netconf-northbound":{ "connectionTimeout":20000, diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/values.yaml b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/values.yaml index 4d197b68b5..0dd1334061 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/values.yaml +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/values.yaml @@ -33,7 +33,7 @@ lighty: trustKeyStorePassword: "8pgETwat" trustKeyStoreDirectory: "keystore" trustKeyStoreFileName: "lightyio.jks" - enableSwagger: false + enableOpenApi: false jmx: # Port on which JMX server in image is listening, should be same as defined in dockerfile diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/main/java/io/lighty/applications/rnc/module/RncLightyModule.java b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/main/java/io/lighty/applications/rnc/module/RncLightyModule.java index 133bf2728f..672fbcbfde 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/main/java/io/lighty/applications/rnc/module/RncLightyModule.java +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/main/java/io/lighty/applications/rnc/module/RncLightyModule.java @@ -81,7 +81,7 @@ public boolean initModules() { startAndWaitLightyModule(this.aaaLighty); } - if (rncModuleConfig.getServerConfig().isEnableSwagger()) { + if (rncModuleConfig.getServerConfig().isEnableOpenApi()) { this.swagger = initSwaggerLighty(this.rncModuleConfig.getRestconfConfig(), this.jettyServerBuilder, this.lightyController.getServices()); @@ -172,7 +172,7 @@ private void startAndWaitLightyModule(final LightyModule lightyModule) throws Rn public boolean close() { LOG.info("Stopping RNC lighty.io application..."); boolean success = true; - if (rncModuleConfig.getServerConfig().isEnableSwagger() && this.swagger != null) { + if (rncModuleConfig.getServerConfig().isEnableOpenApi() && this.swagger != null) { success &= swagger.shutdown(lightyModuleTimeout, DEFAULT_LIGHTY_MODULE_TIME_UNIT); } if (this.rncModuleConfig.getAaaConfig().isEnableAAA() && this.aaaLighty != null) { diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/java/io/lighty/applications/rnc/module/OpenApiTest.java b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/java/io/lighty/applications/rnc/module/OpenApiTest.java index 7a8cd05c78..02e637d413 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/java/io/lighty/applications/rnc/module/OpenApiTest.java +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/java/io/lighty/applications/rnc/module/OpenApiTest.java @@ -46,7 +46,7 @@ public static String[] swaggerUris() { @BeforeClass public void startUp() throws Exception { final var configPath = Paths.get(Objects.requireNonNull(this.getClass() - .getResource("/swagger_config.json")).toURI()); + .getResource("/openapi_config.json")).toURI()); rncModule = new RncLightyModule(RncLightyModuleConfigUtils.loadConfigFromFile(configPath)); assertTrue(rncModule.initModules()); } diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/swagger_config.json b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/openapi_config.json similarity index 99% rename from lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/swagger_config.json rename to lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/openapi_config.json index e2f2fdba01..7426c1abd2 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/swagger_config.json +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/openapi_config.json @@ -72,6 +72,6 @@ "restconfServletContextPath":"/restconf" }, "lighty-server" : { - "enableSwagger": true + "enableOpenApi": true } } diff --git a/lighty-modules/lighty-jetty-server/src/main/java/io/lighty/server/config/LightyServerConfig.java b/lighty-modules/lighty-jetty-server/src/main/java/io/lighty/server/config/LightyServerConfig.java index 57f8378c08..3f60861f9f 100644 --- a/lighty-modules/lighty-jetty-server/src/main/java/io/lighty/server/config/LightyServerConfig.java +++ b/lighty-modules/lighty-jetty-server/src/main/java/io/lighty/server/config/LightyServerConfig.java @@ -20,7 +20,7 @@ public class LightyServerConfig { private boolean useHttps = false; private boolean useHttp2 = false; private boolean needClientAuth = false; - private boolean enableSwagger = false; + private boolean enableOpenApi = false; public void setSecurityConfig(final SecurityConfig securityConfig) { this.securityConfig = securityConfig; @@ -86,12 +86,12 @@ public void setNeedClientAuth(boolean needClientAuth) { this.needClientAuth = needClientAuth; } - public boolean isEnableSwagger() { - return enableSwagger; + public boolean isEnableOpenApi() { + return enableOpenApi; } - public void setEnableSwagger(boolean enableSwagger) { - this.enableSwagger = enableSwagger; + public void setEnableOpenApi(boolean enableOpenApi) { + this.enableOpenApi = enableOpenApi; } public boolean isUseHttp2() { diff --git a/lighty-modules/lighty-jetty-server/src/test/resources/httpsConfig.json b/lighty-modules/lighty-jetty-server/src/test/resources/httpsConfig.json index 3a2910ed57..85ebc8cf9e 100644 --- a/lighty-modules/lighty-jetty-server/src/test/resources/httpsConfig.json +++ b/lighty-modules/lighty-jetty-server/src/test/resources/httpsConfig.json @@ -2,6 +2,6 @@ "lighty-server": { "useHttps": true, "needClientAuth": true, - "enableSwagger": true + "enableOpenApi": true } }