diff --git a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/adapter/httpserver/ThingifierAutoDocGenRouting.java b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/adapter/httpserver/ThingifierAutoDocGenRouting.java index cf93dbce..bd80afd1 100644 --- a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/adapter/httpserver/ThingifierAutoDocGenRouting.java +++ b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/adapter/httpserver/ThingifierAutoDocGenRouting.java @@ -68,7 +68,6 @@ public ThingifierAutoDocGenRouting( openApi31Path, openApi32Path, docsPath, - swaggerDownloadPath, swaggerUiPath) .html(); }); diff --git a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPage.java b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPage.java index 1dbf0934..b15cde3b 100644 --- a/thingifier/src/main/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPage.java +++ b/thingifier/src/main/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPage.java @@ -21,7 +21,6 @@ public final class SwaggerUiPage { private final String openApi31Url; private final String openApi32Url; private final String docsUrl; - private final String downloadUrl; private final String canonicalUrl; public SwaggerUiPage( @@ -32,7 +31,6 @@ public SwaggerUiPage( final String openApi31Url, final String openApi32Url, final String docsUrl, - final String downloadUrl, final String canonicalUrl) { this.apiDefn = apiDefn; this.guiManagement = guiManagement; @@ -41,7 +39,6 @@ public SwaggerUiPage( this.openApi31Url = openApi31Url; this.openApi32Url = openApi32Url; this.docsUrl = docsUrl; - this.downloadUrl = downloadUrl; this.canonicalUrl = canonicalUrl; } @@ -57,10 +54,6 @@ public String html() { html.append("
"); html.append("API Docs"); html.append(" | "); - html.append("Download OpenAPI JSON"); - html.append(" | "); html.append("OpenAPI 3.1 JSON"); @@ -146,7 +139,10 @@ private String lightThemeCss() { ".swagger-ui-page h1{margin-bottom:.25em;}", ".swagger-ui-page #swagger-ui{margin-top:1em;}", ".swagger-ui{background:#fff;color:#222;color-scheme:light;}", - ".swagger-ui .topbar{display:none;}", + ".swagger-ui .topbar{background:#f7f7f7!important;border:1px solid #d7d7d7;" + + "border-radius:4px;margin:1em 0;padding:8px 0;}", + ".swagger-ui .topbar-wrapper{align-items:center;}", + ".swagger-ui .topbar a span{color:#222!important;}", ".swagger-ui .wrapper,.swagger-ui .scheme-container," + ".swagger-ui section.models,.swagger-ui .model-box," + ".swagger-ui .opblock,.swagger-ui .opblock .opblock-summary," diff --git a/thingifier/src/test/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPageTest.java b/thingifier/src/test/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPageTest.java index 282ca8b4..2444f51a 100644 --- a/thingifier/src/test/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPageTest.java +++ b/thingifier/src/test/java/uk/co/compendiumdev/thingifier/swaggerizer/SwaggerUiPageTest.java @@ -21,7 +21,6 @@ void includesCopyForAiAssetsAndOpenApiConfiguration() { "/mirror/docs/openapi-3.1.json", "/mirror/docs/openapi-3.2.json", "/mirror/docs", - "/mirror/docs/swagger", "/mirror/docs/swagger-ui") .html(); @@ -33,5 +32,7 @@ void includesCopyForAiAssetsAndOpenApiConfiguration() { Assertions.assertTrue(html.contains("/mirror/docs/openapi-3.1.json")); Assertions.assertTrue(html.contains("/mirror/docs/openapi-3.2.json")); Assertions.assertTrue(html.contains("\"urls.primaryName\": \"OpenAPI 3.1 default\"")); + Assertions.assertFalse(html.contains("Download OpenAPI JSON")); + Assertions.assertFalse(html.contains(".swagger-ui .topbar{display:none;}")); } }