Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions core/src/main/java/io/apicurio/hub/api/codegen/OpenApi2JaxRs.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public class OpenApi2JaxRs {

static final Map<String, Type<?>> TYPE_CACHE = new HashMap<>();
static final String OPENAPI_OPERATION_ANNOTATION = "org.eclipse.microprofile.openapi.annotations.Operation";
private static final String MEDIA_TYPE_CONSUME_STRING = "MediaType.";

protected static ObjectMapper mapper = new ObjectMapper();
protected static Charset utf8 = StandardCharsets.UTF_8;
Expand Down Expand Up @@ -603,9 +604,14 @@ protected String generateJavaInterface(CodegenInfo info, CodegenJavaInterface in

Optional.ofNullable(methodInfo.getConsumes())
.filter(Predicate.not(Collection::isEmpty))
.map(OpenApi2JaxRs::toStringArrayLiteral)
.ifPresent(consumes ->
operationMethod.addAnnotation(String.format("%s.ws.rs.Consumes", topLevelPackage)).setLiteralValue(consumes));
.ifPresent(consumesSet -> {
// Add MediaType import if any consumes value uses MediaType constants
if (consumesSet.stream().anyMatch(consume -> consume.contains(MEDIA_TYPE_CONSUME_STRING))) {
resourceInterface.addImport(String.format("%s.ws.rs.core.MediaType", topLevelPackage));
}
String consumesLiteral = toStringArrayLiteral(consumesSet);
operationMethod.addAnnotation(String.format("%s.ws.rs.Consumes", topLevelPackage)).setLiteralValue(consumesLiteral);
});

final boolean reactive;

Expand Down Expand Up @@ -638,6 +644,10 @@ protected String generateJavaInterface(CodegenInfo info, CodegenJavaInterface in
if (arg.getIn().equals("body")) {
// Swagger 2.0?
defaultParamType = InputStream.class.getName();
} else if (arg.getIn().equals("form")
&& arg.getType() != null
&& !arg.getType().isEmpty()) {
defaultParamType = arg.getType().get(0);
}

Type<?> paramType = generateTypeName(arg, arg.getRequired(), defaultParamType);
Expand Down Expand Up @@ -667,6 +677,11 @@ protected String generateJavaInterface(CodegenInfo info, CodegenJavaInterface in
param.addAnnotation(String.format("%s.ws.rs.CookieParam", topLevelPackage))
.setStringValue(arg.getName());
break;
case "form":
param.addAnnotation("org.jboss.resteasy.annotations.providers.multipart.RestForm")
.setStringValue(arg.getName());
resourceInterface.addImport("org.jboss.resteasy.annotations.providers.multipart.RestForm");
break;
default:
break;
}
Expand Down Expand Up @@ -876,19 +891,30 @@ protected static String toStringArrayLiteral(Set<String> values) {
StringBuilder builder = new StringBuilder();

if (values.size() == 1) {
builder.append("\"");
builder.append(values.iterator().next().replace("\"", "\\\""));
builder.append("\"");
String value = values.iterator().next();
if (value.startsWith(MEDIA_TYPE_CONSUME_STRING)) {
// Don't quote MediaType constants
builder.append(value);
} else {
builder.append("\"");
builder.append(value.replace("\"", "\\\""));
builder.append("\"");
}
} else {
builder.append("{");
boolean first = true;
for (String value : values) {
if (!first) {
builder.append(", ");
}
builder.append("\"");
builder.append(value.replace("\"", "\\\""));
builder.append("\"");
if (value.startsWith(MEDIA_TYPE_CONSUME_STRING)) {
// Don't quote MediaType constants
builder.append(value);
} else {
builder.append("\"");
builder.append(value.replace("\"", "\\\""));
builder.append("\"");
}
first = false;
}
builder.append("}");
Expand Down
Loading