Fix OpenAPI EvoMaster compatibility

thingifier/src/main/java/uk/co/compendiumdev/thingifier/adapter/httpserver/ThingifierAutoDocGenRouting.java

@@ -122,9 +122,7 @@ public ThingifierAutoDocGenRouting(
                         System.out.println(
                                 "Possibly incomplete swagger generation, api not defined from model");
                     }
-                    if (config.includeMethodNotAllowedEndpoints && !config.includeFieldValidation) {
-                        nameprefix = nameprefix + "permissive-";
-                    }
+                    nameprefix = nameprefix + variantFilenamePrefix(config);
                     response.header("Content-Type", "application/octet-stream");
                     response.header(
                             "Content-Disposition",
@@ -152,11 +150,7 @@ private void registerOpenApiEndpoint(
                         response.header(
                                 "Content-Disposition",
                                 "attachment; filename=\"%s\""
-                                        .formatted(
-                                                openApiDownloadFilename(
-                                                        path,
-                                                        config.includeMethodNotAllowedEndpoints
-                                                                && !config.includeFieldValidation)));
+                                        .formatted(openApiDownloadFilename(path, config)));
                     }
                     return new Swaggerizer(apiDefn)
                             .asJsonWithPreferredServer(config, HttpRequestOrigin.from(request));
@@ -192,11 +186,26 @@ private SwaggerGenerationConfig.PathParameterPlacement pathParameterPlacement(
         return SwaggerGenerationConfig.PathParameterPlacement.PATH;
     }
 
-    private String openApiDownloadFilename(final String path, final boolean permissive) {
+    private String openApiDownloadFilename(
+            final String path, final SwaggerGenerationConfig config) {
         final String filename = path.substring(path.lastIndexOf("/") + 1);
-        if (permissive) {
-            return "permissive-" + filename;
+        return variantFilenamePrefix(config) + filename;
+    }
+
+    private String variantFilenamePrefix(final SwaggerGenerationConfig config) {
+        final StringBuilder prefix = new StringBuilder();
+
+        if (config.includeMethodNotAllowedEndpoints) {
+            prefix.append("permissive-");
         }
-        return filename;
+        if (config.strongSchemas) {
+            prefix.append("strong-");
+        }
+        if (config.pathParameterPlacement
+                == SwaggerGenerationConfig.PathParameterPlacement.OPERATION) {
+            prefix.append("operational-");
+        }
+
+        return prefix.toString();
     }
 }

thingifier/src/main/java/uk/co/compendiumdev/thingifier/adapter/javalin/JavalinServerResponse.java

@@ -1,6 +1,7 @@
 package uk.co.compendiumdev.thingifier.adapter.javalin;
 
 import io.javalin.http.Context;
+import io.javalin.http.HandlerType;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -28,6 +29,9 @@ public String body() {
     public void body(final String body) {
         bodySet = true;
         context.attribute(RESPONSE_BODY_ATTRIBUTE, body == null ? "" : body);
+        if (context.method() == HandlerType.HEAD) {
+            return;
+        }
         context.result((body == null ? "" : body).getBytes(StandardCharsets.UTF_8));
     }
 

thingifier/src/main/java/uk/co/compendiumdev/thingifier/api/docgen/ApiRoutingDefinitionDocGenerator.java

@@ -185,7 +185,7 @@ public ApiRoutingDefinition generate(String apiPathPrefix) {
                     optionsDocumentationFor(pluralUrl),
                     RoutingVerb.OPTIONS,
                     pluralUrl,
-                    RoutingStatus.returnValue(204, "the endpoint verb options"),
+                    RoutingStatus.returnValue(200, "the endpoint verb options"),
                     new ResponseHeader("Allow", "OPTIONS, GET, HEAD, POST, QUERY"));
 
             // the following are not handled so return 405
@@ -357,7 +357,7 @@ public ApiRoutingDefinition generate(String apiPathPrefix) {
                             optionsDocumentationFor(aUrlWGuid),
                             RoutingVerb.OPTIONS,
                             aUrlWGuid,
-                            RoutingStatus.returnValue(204),
+                            RoutingStatus.returnValue(200),
                             new ResponseHeader("Allow", "OPTIONS, GET, HEAD, POST, PUT, DELETE"))
                     .addRequestUrlParam(entityDefn.getField(uniqueIdFieldName));