Clean up API urls by eliminating basepath from the wrong location.

USACE · Dec 30, 2024 · f0bdaee · f0bdaee
1 parent ad47448
commit f0bdaee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 727 deletions.
diff --git a/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java b/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java
@@ -181,6 +181,8 @@
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.servers.Server;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -276,6 +278,7 @@ public class ApiServlet extends HttpServlet {
     private static final long serialVersionUID = 1L;
 
     JavalinServlet javalin = null;
+    private String APP_CONTEXT;
 
     @Resource(name = "jdbc/CWMS3")
     DataSource cwms;
@@ -315,10 +318,9 @@ public void init() {
         om.registerModule(new JavaTimeModule());
 
         PolicyFactory sanitizer = new HtmlPolicyBuilder().disallowElements("<script>").toFactory();
-        String context = this.getServletContext().getContextPath();
+        APP_CONTEXT = this.getServletContext().getContextPath();
         javalin = Javalin.createStandalone(config -> {
                     config.defaultContentType = "application/json";
-                    config.contextPath = context;
                     getOpenApiOptions(config);
                     config.autogenerateEtags = true;
                     config.requestLogger((ctx, ms) -> logger.atFinest().log(ctx.toString()));
@@ -876,10 +878,12 @@ private void getOpenApiOptions(JavalinConfig config) {
         });
 
         config.accessManager(am);
-
+        List<Server> servers = new ArrayList<>();
+        servers.add(new Server().url(APP_CONTEXT));
         OpenApiOptions ops =
             new OpenApiOptions(
                 () -> new OpenAPI().components(components)
+                                   .servers(servers)
                                    .info(applicationInfo)
                                    .addSecurityItem(new SecurityRequirement().addList(provider))
         );