From f4c779aeddebf9d25d3888de47da9299596c6b53 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Fri, 12 May 2023 10:43:35 +0200 Subject: [PATCH] Remove swagger2 Remove all swagger2 path occurrences and related stuff. JIRA: LIGHTY-223 Signed-off-by: tobias.pobocik --- .../java/io/lighty/swagger/SwaggerLighty.java | 1 - .../swagger/SwaggerLightyRFC8040Test.java | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/lighty-modules/lighty-swagger/src/main/java/io/lighty/swagger/SwaggerLighty.java b/lighty-modules/lighty-swagger/src/main/java/io/lighty/swagger/SwaggerLighty.java index b4c999c772..52fd42c3d4 100644 --- a/lighty-modules/lighty-swagger/src/main/java/io/lighty/swagger/SwaggerLighty.java +++ b/lighty-modules/lighty-swagger/src/main/java/io/lighty/swagger/SwaggerLighty.java @@ -65,7 +65,6 @@ protected boolean initProcedure() { ContextHandlerCollection contexts = new ContextHandlerCollection(); ServletContextHandler mainHandler = new ServletContextHandler(contexts, APIDOC_PATH, true, false); - mainHandler.addServlet(restServletHolder, "/swagger2/apis/*"); mainHandler.addServlet(restServletHolder, "/openapi3/apis/*"); addStaticResources(mainHandler, "/explorer", "static-content"); diff --git a/lighty-modules/lighty-swagger/src/test/java/io/lighty/swagger/SwaggerLightyRFC8040Test.java b/lighty-modules/lighty-swagger/src/test/java/io/lighty/swagger/SwaggerLightyRFC8040Test.java index d7b38be0fb..252a195336 100644 --- a/lighty-modules/lighty-swagger/src/test/java/io/lighty/swagger/SwaggerLightyRFC8040Test.java +++ b/lighty-modules/lighty-swagger/src/test/java/io/lighty/swagger/SwaggerLightyRFC8040Test.java @@ -12,7 +12,6 @@ public class SwaggerLightyRFC8040Test extends SwaggerLightyTest { - private static final String SWAGGER2_BASE_URI = "http://localhost:8888/apidoc/swagger2/apis"; private static final String OPENAPI3_BASE_URI = "http://localhost:8888/apidoc/openapi3/apis"; @Test @@ -20,31 +19,18 @@ public void simpleSwaggerModuleTest() { super.simpleSwaggerModuleTest(); } - @Test - public void testGetListOfMountsSwagger2() { - super.testGetListOfMounts(mockUriInfo(SWAGGER2_BASE_URI + "/mounts")); - } @Test public void testGetListOfMountsOpenApi3() { super.testGetListOfMounts(mockUriInfo(OPENAPI3_BASE_URI + "/mounts")); } - @Test - public void testGetAllModulesDocSwagger2() { - super.testGetAllModulesDoc(mockUriInfo(SWAGGER2_BASE_URI + "/single")); - } @Test public void testGetAllModulesDocOpenApi3() { super.testGetAllModulesDoc(mockUriInfo(OPENAPI3_BASE_URI + "/single")); } - @Test - public void testGetDocByModuleSwagger2() { - String path = SWAGGER2_BASE_URI + "/" + DEFAULT_MODEL_NAME + "(" + DEFAULT_REVISION_DATE + ")"; - super.testGetDocByModule(mockUriInfo(path), DEFAULT_MODEL_NAME, DEFAULT_REVISION_DATE); - } @Test public void testGetDocByModuleOpenApi3() { @@ -52,10 +38,6 @@ public void testGetDocByModuleOpenApi3() { super.testGetDocByModule(mockUriInfo(path), DEFAULT_MODEL_NAME, DEFAULT_REVISION_DATE); } - @Test - public void testGetApiExplorerSwagger2() { - super.testGetApiExplorer(mockUriInfo(SWAGGER2_BASE_URI + "/ui")); - } @Test public void testGetApiExplorerOpenApi3() {