From f0bdaee73f9be8458d5f122017164c53b28c13f2 Mon Sep 17 00:00:00 2001
From: Mike Neilson <michael.a.neilson@usace.army.mil>
Date: Mon, 30 Dec 2024 22:13:03 +0000
Subject: [PATCH] Clean up API urls by eliminating basepath from the wrong
 location.

---
 .../src/main/java/cwms/cda/ApiServlet.java    |  10 +-
 .../src/main/webapp/swagger-config.yaml       | 723 ------------------
 cwms-data-api/src/main/webapp/swagger-ui.html |   1 -
 3 files changed, 7 insertions(+), 727 deletions(-)
 delete mode 100644 cwms-data-api/src/main/webapp/swagger-config.yaml

diff --git a/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java b/cwms-data-api/src/main/java/cwms/cda/ApiServlet.java
index f67ae3572..183473c7b 100644
--- 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))
         );
diff --git a/cwms-data-api/src/main/webapp/swagger-config.yaml b/cwms-data-api/src/main/webapp/swagger-config.yaml
deleted file mode 100644
index ce9e50d11..000000000
--- a/cwms-data-api/src/main/webapp/swagger-config.yaml
+++ /dev/null
@@ -1,723 +0,0 @@
-swagger: '2.0'
-info:
-  version: '1.0.0'
-  title: CWMS Data API
-  description: CWMS Data API is a generalized web service API that allows clients to retrieve data from Corps Water Management System (CWMS) databases.
-  termsOfService: https://cwms-data.usace.army.mil/cwms-data
-  contact:
-    name: Support
-    url: https://github.com/usace/cwms-data-api
-host: https://cmws-data.usace.army.mil
-url: /cwms-data/swagger-docs
-basePath: /cwms-data
-schemes:
-  - https
-consumes:
-  - application/json
-produces:
-  - application/json
-  - application/xml
-  - text/plain
-  - text/csv
-paths:
-  /locations:
-    get:
-      description: Returns CWMS location data
-      operationId: findLocations
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-        - text/csv
-      parameters:
-        - name: name
-          in: query
-          description:  |
-            Specifies the name(s) of the location(s) whose data is to be included in the response.  The name(s) shall be matched with values in the AV_LOC2.LOCATION_ID view column in a case insensitive manner to determine the locations to include.
-          required: false
-          type: array
-          items:
-            type: string
-          collectionFormat: pipes
-        - name: office
-          in: query
-          description:  |
-            Specifies the owning office of the location(s) to include in the response.  If this field is not specified, matching location information from all offices shall be returned.
-          required: false
-          type: string
-        - name: unit
-          in: query
-          description:  |
-            Specifies the elevation unit of the response.
-            Valid values for the unit field are:
-                1.  EN.  Specifies English unit system. Elevation values will be in feet.
-                2.  SI.   Specifies the SI unit system.  Elevation values will be in meters.
-                3.  Other.  Any unit returned in the response to the units URI request that has an abstract parameter of 'Length'.
-            If this field is not specified, the response shall be the same as if 'EN' were specified.
-          required: false
-          type: string
-          enum: ["EN", "SI", "Other"]
-        - name: datum
-          in: query
-          description:  |
-            Specifies the elevation datum of the response.
-            Valid values for this field are:
-                1.	NAVD88.  The elevation values will be in the specified or default units above the NAVD-88 datum.
-                2.	NGVD29.  The elevation values will be in the specified or default units above the NGVD-29 datum.
-            If this field is not specified, each elevation value will be in the specified or default units above that location's native vertical datum in the database, which is identified in the response.
-          required: false
-          type: string
-          enum: [NAVD88, NGVD29]
-        - name: format
-          in: query
-          description:  |
-            Specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	tab
-                2.	csv
-                3.	xml
-                4.	wml2 (only if name field is specified)
-                5.	json
-              If this field is not specified, the 'tab' format shall be used.
-          required: false
-          type: string
-          enum: ["tab", "csv", "xml", "wml2", "json"]
-      responses:
-        '200':
-          description: location response
-          schema:
-            type: array
-            items:
-              $ref: '#/definitions/location'
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  /locations/{id}:
-    get:
-      description: Returns a location based on a single ID
-      operationId: findLocationById
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-      parameters:
-        - name: id
-          in: path
-          description: ID of location to fetch
-          required: true
-          type: integer
-          format: int64
-      responses:
-        '200':
-          description: location response
-          schema:
-            $ref: '#/definitions/location'
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  /timeseries:
-    get:
-      description: Returns Cwms time series data
-      operationId: findTimeseries
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-        - text/csv
-      parameters:
-        - name: name
-          in: query
-          description:  |
-            Specifies the name(s) of the time series whose data is to be included in the response.  The name(s) shall be matched with values in the AV_CWMS_TS_ID2.LOCATION_ID view column in a case insensitive manner to determine the locations to include.
-          required: false
-          type: array
-          items:
-            type: string
-          collectionFormat: csv
-        - name: office
-          in: query
-          description:  |
-            Specifies the owning office of the time series whose data is to be included in the response.  If this field is not specified, matching time series information from all offices shall be returned.
-          required: false
-          type: string
-        - name: unit
-          in: query
-          description:  |
-            Specifies the unit or unit system of the response. Valid values for the unit field are:
-                1.	EN.   Specifies English unit system.  Time series values will be in the default English units for their parameters.
-                2.	SI.   Specifies the SI unit system.  Time series values will be in the default SI units for their parameters.
-                3.	Other. Any unit returned in the response to the units URI request that is appropriate for the requested parameters.
-            If this field is not specified, the response shall be the same as if 'EN' were specified.
-          required: false
-          type: string
-          enum: ["EN", "SI", "Other"]
-        - name: datum
-          in: query
-          description:  |
-            Specifies the elevation datum of the response.  This field affects only elevation time series.  Valid values for this field are:
-                1.	NAVD88.  The elevation values will in the specified or default units above the NAVD-88 datum.
-                2.	NGVD29.  The elevation values will be in the specified or default units above the NGVD-29 datum.
-              If this field is not specified, elevation time series will be in the specified or default units above that location's native vertical datum in the database, which is identified in the response.
-          required: false
-          type: string
-          enum: ["NAVD88", "NGVD29"]
-        - name: begin
-          in: query
-          description:  |
-            Specifies the start of the time window for data to be included in the response.  If this field is not specified, any required time window begins 24 hours prior to the specified or default end time.  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: end
-          in: query
-          description:  |
-            Specifies the end of the time window for data to be included in the response.  If this field is not specified, any required time window ends at the current time.  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: timezone
-          in: query
-          description:  |
-            Specifies the time zone of the values of the begin and end fields (unless otherwise specified), as well as the time zone of any times in the response.  If this field is not specified, the default time zone of UTC shall be used.
-          required: false
-          type: string
-        - name: size
-          in: query
-          description:  |
-            Specifies the size of the image in pixels if the value of the format field is 'jpg' or 'img'.  If this field is not specified, the default size of '600x500' (width x height) shall be used for any generated images.
-          required: false
-          type: string
-        - name: format
-          in: query
-          description:  |
-            Specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	tab
-                2.	csv
-                3.	xml
-                4.	wml2 (only if name field is specified)
-                5.	json
-                6.	jpg (only if name field is specified)
-                7.	png (only if name field is specified)
-            If this field is not specified, the 'tab' format shall be used.
-          required: false
-          type: string
-          enum: ["tab", "csv", "xml", "wml2", "json", "jpg", "png"]
-      responses:
-        '200':
-          description: location response
-          schema:
-            type: array
-            items:
-              $ref: '#/definitions/location'
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  /ratings:
-    get:
-      description: The ratings URI allows access to CWMS ratings data
-      operationId: findRatings
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-        - text/csv
-      parameters:
-        - name: name
-          in: query
-          description:  |
-            Specifies the name(s) of the ratings  whose data is to be included in the response.  The name(s) shall be matched with values in the AV_RATING_SPEC.RATING_ID view column in a case insensitive manner to determine the locations to include.
-          required: false
-          type: array
-          items:
-            type: string
-          collectionFormat: csv
-        - name: office
-          in: query
-          description:  |
-            Specifies the owning office of the rating(s) whose data is to be included in the response.  If this field is not specified, matching rating information from all offices shall be returned.
-          required: false
-          type: string
-        - name: unit
-          in: query
-          description:  |
-            Specifies the unit or unit system of the response. Valid values for the unit field are:
-                1.  NATIVE.  Specifies native rating units.  Rating values will be in the units that the rating was originally defined in.
-                2.	EN.   Specifies English unit system.  Rating values will be in the default English units for their parameters.
-                3.	SI.   Specifies the SI unit system.  Rating values will be in the default SI units for their parameters.
-                4.	Other. Each rating has multiple units ' one for each independent parameter and one for the dependent parameter.  Therefore, units must be specified in sets for each rating.  The format is to separate the independent parameter units from each other using the comma ',' character and to separate the independent parameter unit(s) from the dependent parameter unit using the semicolon ';' character.  Each unit in a rating unit set must be in the set of units returned in the response to the units URI request that is appropriate for the requested the corresponding parameter.
-            If this field is not specified, the response shall be the same as if 'NATIVE' were specified.
-          required: false
-          type: string
-          enum: ["NATIVE", "EN", "SI", "Other"]
-        - name: datum
-          in: query
-          description:  |
-            Specifies the elevation datum of the response.  This field affects only elevation rating values.  Valid values for this field are:
-                1.	NAVD88.  The elevation values will in the specified or default units above the NAVD-88 datum.
-                2.	NGVD29.  The elevation values will be in the specified or default units above the NGVD-29 datum.
-              If this field is not specified, elevation rating values will be in the specified or default units above that location's native vertical datum in the database, which is identified in the response.
-          required: false
-          type: string
-          enum: ["NAVD88", "NGVD29"]
-        - name: begin
-          in: query
-          description:  |
-            Specifies the start of the effective date time window for data to be included in the response.  If this field is not specified, any required time window begins at the latest rating effective time on or before the (default or specified) end time (i.e., the single rating effective at the end time is returned).  If this field is specified as 'none' (case in-sensitive), any required effective date time will have no beginning time (i.e., all ratings with effective dates on or before the end time are returned).  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: end
-          in: query
-          description:  |
-            Specifies the end of the effective date time window for data to be included in the response.  If this field is not specified, any required time window ends at the current time.  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: timezone
-          in: query
-          description:  |
-            Specifies the time zone of the values of the begin and end fields (unless otherwise specified), as well as the time zone of any times in the response.  If this field is not specified, the default time zone of UTC shall be used.
-          required: false
-          type: string
-        - name: size
-          in: query
-          description:  |
-            Specifies the size of the image in pixels if the value of the format field is 'jpg' or 'img'.  If this field is not specified, the default size of '600x500' (width x height) shall be used for any generated images.
-          required: false
-          type: string
-        - name: format
-          in: query
-          description:  |
-            Specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	tab
-                2.	csv
-                3.	xml
-                4.	json
-                5.	jpg (only if name field is specified)
-                6.	png (only if name field is specified)
-            If this field is not specified, the 'tab' format shall be used.
-          required: false
-          type: string
-          enum: ["tab", "csv", "xml", "json", "jpg", "png"]
-      responses:
-        '200':
-          description: ratings response
-          schema:
-            type: string
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  /levels:
-    get:
-      description: The levels URI allows access to CWMS location level data.  The responses to this URI are time series views of the matching location levels for the specified or default time window; location level definitions are not included in the responses.
-      operationId: findLevels
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-        - text/csv
-      parameters:
-        - name: name
-          in: query
-          description:  |
-            Specifies the name(s) of the location level(s) whose data is to be included in the response.  The name(s) shall be matched with values in the AV_LOCATION_LEVEL2.LOCATION_LEVEL_ID view column in a case insensitive manner to determine the locations to include.
-          required: false
-          type: array
-          items:
-            type: string
-          collectionFormat: csv
-        - name: office
-          in: query
-          description:  |
-            Specifies the owning office of the location level(s) whose data is to be included in the response.  If this field is not specified, matching location level information from all offices shall be returned.
-          required: false
-          type: string
-        - name: unit
-          in: query
-          description:  |
-            Specifies the unit or unit system of the response. Valid values for the unit field are:
-                1.	EN.   Specifies English unit system.  Location level values will be in the default English units for their parameters.
-                2.	SI.   Specifies the SI unit system.  Location level values will be in the default SI units for their parameters.
-                3.	Other. Any unit returned in the response to the units URI request that is appropriate for the requested parameters.
-            If this field is not specified, the response shall be the same as if 'EN' were specified.
-          required: false
-          type: string
-          enum: [ "EN", "SI", "Other"]
-        - name: datum
-          in: query
-          description:  |
-            Specifies the elevation datum of the response.  This field affects only elevation location levels.  Valid values for this field are:
-                1.	NAVD88.  The elevation values will in the specified or default units above the NAVD-88 datum.
-                2.	NGVD29.  The elevation values will be in the specified or default units above the NGVD-29 datum.
-              If this field is not specified, elevation location levels will be in the specified or default units above that location's native vertical datum in the database, which is identified in the response.
-          required: false
-          type: string
-          enum: ["NAVD88", "NGVD29"]
-        - name: begin
-          in: query
-          description:  |
-            Specifies the start of the time window for data to be included in the response.  If this field is not specified, any required time window begins 24 hours prior to the specified or default end time.  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: end
-          in: query
-          description:  |
-            Specifies the end of the time window for data to be included in the response.  If this field is not specified, any required time window ends at the current time.  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: timezone
-          in: query
-          description:  |
-            Specifies the time zone of the values of the begin and end fields (unless otherwise specified), as well as the time zone of any times in the response.  If this field is not specified, the default time zone of UTC shall be used.
-          required: false
-          type: string
-        - name: size
-          in: query
-          description:  |
-            Specifies the size of the image in pixels if the value of the format field is 'jpg' or 'img'.  If this field is not specified, the default size of '600x500' (width x height) shall be used for any generated images.
-          required: false
-          type: string
-        - name: format
-          in: query
-          description:  |
-            Specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	tab
-                2.	csv
-                3.	xml
-                4.  wml2 (only if name field is specified)
-                5.	json
-                6.	jpg (only if name field is specified)
-                7.	png (only if name field is specified)
-          required: false
-          type: string
-          enum: ["tab", "csv", "xml", "wml2", "json", "jpg", "png"]
-      responses:
-        '200':
-          description: levels response
-          schema:
-            type: string
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  # /offices:
-  #   get:
-  #     description: The offices URI allows access to CWMS office data.
-  #     operationId: findOffices
-  #     produces:
-  #       - application/json
-  #       - application/xml
-  #       - text/xml
-  #       - text/html
-  #       - text/csv
-  #     parameters:
-  #       - name: format
-  #         in: query
-  #         description:  |
-  #           Specifies specifies the encoding format of the response.  Valid values for the format field for this URI are:
-  #               1.	tab
-  #               2.	csv
-  #               3.	xml
-  #               4.	json
-  #         required: false
-  #         type: string
-  #         enum: ["tab", "csv", "xml", "json"]
-  #     responses:
-  #       '200':
-  #         description: office response
-  #         schema:
-  #           type: string
-  #       default:
-  #         description: unexpected error
-  #         schema:
-  #          $ref: '#/definitions/errorModel'
-  /timezones:
-    get:
-      description: The timezones URI allows access to CWMS time zone data.
-      operationId: findTimezones
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-        - text/csv
-      parameters:
-        - name: format
-          in: query
-          description:  |
-            Specifies specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	tab
-                2.	csv
-                3.	xml
-                4.	json
-          required: false
-          type: string
-          enum: ["tab", "csv", "xml", "json"]
-      responses:
-        '200':
-          description: timezone response
-          schema:
-            type: string
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  /parameters:
-    get:
-      description: The parameters URI allows access to CWMS base parameter data.
-      operationId: findParameters
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-        - text/csv
-      parameters:
-        - name: format
-          in: query
-          description:  |
-            Specifies specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	tab
-                2.	csv
-                3.	xml
-                4.	json
-          required: false
-          type: string
-          enum: ["tab", "csv", "xml", "json"]
-      responses:
-        '200':
-          description: parameters response
-          schema:
-            type: string
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  /units:
-    get:
-      description: The units URI allows access to CWMS unit data.
-      operationId: findUnits
-      produces:
-        - application/json
-        - application/xml
-        - text/xml
-        - text/html
-        - text/csv
-      parameters:
-        - name: format
-          in: query
-          description:  |
-            Specifies specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	tab
-                2.	csv
-                3.	xml
-                4.	json
-          required: false
-          type: string
-          enum: ["tab", "csv", "xml", "json"]
-      responses:
-        '200':
-          description: units response
-          schema:
-            type: string
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-  /plots:
-    get:
-      description: The plots URI allows access to CWMS plotting API. The plotting API will generate plots that include time series, location level time series, and ratings. At least one of 'timeseries', 'level', or 'rating' must be specified.
-      operationId: findPlots
-      produces:
-        - image/jpeg
-        - image/png
-      parameters:
-        - name: timeseries
-          in: query
-          description:  |
-            Specifies the name(s) of the time series whose data is to be included in the response.  The name(s) shall be matched with values in the AV_CWMS_TS_ID2.LOCATION_ID view column in a case insensitive manner to determine the locations to include.
-          required: false
-          type: array
-          items:
-            type: string
-          collectionFormat: pipes
-        - name: level
-          in: query
-          description:  |
-            Specifies the name(s) of the location level(s) whose data is to be included in the response.  The name(s) shall be matched with values in the AV_LOCATION_LEVEL2.LOCATION_LEVEL_ID view column in a case insensitive manner to determine the locations to include.
-          required: false
-          type: array
-          items:
-            type: string
-          collectionFormat: pipes
-        - name: rating
-          in: query
-          description:  |
-            Specifies the name(s) of the ratings  whose data is to be included in the response.  The name(s) shall be matched with values in the AV_RATING_SPEC.RATING_ID view column in a case insensitive manner to determine the locations to include.
-          required: false
-          type: array
-          items:
-            type: string
-          collectionFormat: pipes
-        - name: office
-          in: query
-          description:  |
-            Specifies the owning office of the location level(s) whose data is to be included in the response.  If this field is not specified, matching plot information from all offices shall be returned.
-          required: false
-          type: string
-        - name: unit
-          in: query
-          description:  |
-            Specifies the unit or unit system of the response.
-            Valid values for the unit field are:
-                1.  NATIVE.  (Only for ratings). Specifies native rating units.  Rating values will be in the units that the rating was originally defined in.
-                2.  EN.  Specifies English unit system.  Values will be in the default English units for their parameter.
-                3.  SI.   Specifies the SI unit system.  Values will be in the default SI units for their parameter.
-            If this field is not specified, the response shall be the same as if 'NATIVE' were specified for ratings and 'EN' were specified for time series and levels.
-          required: false
-          type: string
-          enum: ["EN", "SI", "Other"]
-        - name: datum
-          in: query
-          description:  |
-            Specifies the elevation datum of the response.  This field affects only elevation location levels.  Valid values for this field are:
-                1.	NAVD88.  The elevation values will be in the specified or default units above the NAVD-88 datum.
-                2.	NGVD29.  The elevation values will be in the specified or default units above the NGVD-29 datum.
-            If this field is not specified, elevation location levels will be in the specified or default units above that location's native vertical datum in the database, which is identified in the response.
-          required: false
-          type: string
-          enum: [NAVD88, NGVD29]
-        - name: begin
-          in: query
-          description:  |
-            Specifies the start of the time window for data to be included in the response.  If this field is not specified, any required time window begins 24 hours prior to the specified or default end time.  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: end
-          in: query
-          description:  |
-            Specifies the end of the time window for data to be included in the response.  If this field is not specified, any required time window ends at the current time.  The format for this field is ISO 8601 extended, i.e., 'YYYY-MM-DDThh:mm:ss'.
-          required: false
-          type: string
-          format: dateTime
-        - name: timezone
-          in: query
-          description:  |
-            Specifies the time zone of the values of the begin and end fields (unless otherwise specified), as well as the time zone of any times in the response.  If this field is not specified, the default time zone of UTC shall be used.
-          required: false
-          type: string
-        - name: size
-          in: query
-          description:  |
-            Specifies the size of the image in pixels if the value of the format field is 'jpg' or 'img'.  If this field is not specified, the default size of '600x500' (width x height) shall be used for any generated images.
-          required: false
-          type: string
-        - name: format
-          in: query
-          description:  |
-            Specifies the encoding format of the response.  Valid values for the format field for this URI are:
-                1.	jpg (only if name field is specified)
-                2.	png (only if name field is specified)
-              If this field is not specified, the 'jpg' format shall be used.
-          required: false
-          type: string
-          enum: ["jpg", "png"]
-      responses:
-        '200':
-          description: plots response
-          schema:
-            type: string
-        default:
-          description: unexpected error
-          schema:
-            $ref: '#/definitions/errorModel'
-definitions:
-  location:
-    properties:
-      id:
-        type: integer
-        format: int64
-      baseLocationId:
-        type: string
-      subLocationId:
-        type: string
-      locationType:
-        type: string
-      elevation:
-        type: number
-        format: double
-      unitId:
-        type: string
-      verticalDatum:
-        type: string
-      latitude:
-        type: number
-        format: double
-      longitude:
-        type: number
-        format: double
-      horizontalDatum:
-        type: string
-      timeZoneName:
-        type: string
-      countyName:
-        type: string
-      stateInitial:
-        type: string
-      publicName:
-        type: string
-      longName:
-        type: string
-      description:
-        type: string
-      baseLocActiveFlag:
-        type: string
-      locActiveFlag:
-        type: string
-      locationKindId:
-        type: string
-      mapLabel:
-        type: string
-      publishedLatitude:
-        type: number
-        format: double
-      publishedLongitude:
-        type: number
-        format: double
-      boundingOfficeId:
-        type: string
-      nationId:
-        type: string
-      nearestCity:
-        type: string
-      dbOfficeId:
-        type: string
-      locationId:
-        type: string
-      unitSystem:
-        type: string
-             #	private BigDecimal baseLocationCode;
-    required:
-      - id
-
-  errorModel:
-    required:
-      - code
-      - message
-    properties:
-      code:
-        type: integer
-        format: int32
-      message:
-        type: string
diff --git a/cwms-data-api/src/main/webapp/swagger-ui.html b/cwms-data-api/src/main/webapp/swagger-ui.html
index 8fab23c86..5bfadb21e 100644
--- a/cwms-data-api/src/main/webapp/swagger-ui.html
+++ b/cwms-data-api/src/main/webapp/swagger-ui.html
@@ -40,7 +40,6 @@
                 const ui = SwaggerUIBundle({
                     url: "./swagger-docs",
                     dom_id: "#swagger-ui",
-                    configUrl: "./swagger-config.yaml",
                     deepLinking: false,
                     presets: [
                         SwaggerUIBundle.presets.apis