Fixes #56 ; Don't attempt to set Content-Type header if the request is using multipart-formdata

packages/handlebars-templates/src/index.ts

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs'
 import path from 'path'
 import Handlebars, { HelperOptions } from 'handlebars'
 import { camelCase, capitalize, pascalCase, uniquePropertiesIncludingInherited, debugStringify, uniquePropertiesIncludingInheritedForParents } from '@openapi-generator-plus/generator-common'
-import { CodegenGeneratorContext, CodegenSchemaType, CodegenResponse, CodegenRequestBody, CodegenObjectSchema, CodegenOperation, CodegenVendorExtensions, CodegenExamples, CodegenContent, CodegenLogLevel, CodegenSchemaUsage, CodegenSchema, isCodegenParameter, isCodegenProperty } from '@openapi-generator-plus/types'
+import { CodegenGeneratorContext, CodegenSchemaType, CodegenResponse, CodegenRequestBody, CodegenObjectSchema, CodegenOperation, CodegenVendorExtensions, CodegenExamples, CodegenContent, CodegenLogLevel, CodegenSchemaUsage, CodegenSchema, isCodegenParameter, isCodegenProperty, CodegenContentEncodingType } from '@openapi-generator-plus/types'
 import { snakeCase, constantCase, sentenceCase, capitalCase } from 'change-case'
 import pluralize from 'pluralize'
 import * as idx from '@openapi-generator-plus/indexed-type'
@@ -910,10 +910,10 @@ export function registerStandardHelpers(hbs: typeof Handlebars, { generator, log
 		return !!value.mediaType.mimeType.match('\\bjson$')
 	})
 	hbs.registerHelper('isContentMultipart', function(value: CodegenContent): boolean {
-		return !!value.mediaType.mimeType.match('^multipart/.*')
+		return value.encoding?.type === CodegenContentEncodingType.MULTIPART
 	})
 	hbs.registerHelper('isContentFormUrlEncoded', function(value: CodegenContent): boolean {
-		return value.mediaType.mimeType === 'application/x-www-form-urlencoded'
+		return value.encoding?.type === CodegenContentEncodingType.WWW_FORM_URLENCODED
 	})
 
 	function isEmpty(ob: UnknownObject) {

packages/java-jaxrs-common/src/index.ts

@@ -1,4 +1,4 @@
-import { CodegenSchemaType, CodegenConfig, CodegenGeneratorContext, CodegenDocument, CodegenGenerator, isCodegenObjectSchema, isCodegenEnumSchema, CodegenNativeType, CodegenProperty, CodegenAllOfStrategy, CodegenAnyOfStrategy, CodegenOneOfStrategy, CodegenLogLevel, isCodegenInterfaceSchema, isCodegenWrapperSchema, CodegenSchema, CodegenSchemaPurpose } from '@openapi-generator-plus/types'
+import { CodegenSchemaType, CodegenConfig, CodegenGeneratorContext, CodegenDocument, CodegenGenerator, isCodegenObjectSchema, isCodegenEnumSchema, CodegenNativeType, CodegenProperty, CodegenAllOfStrategy, CodegenAnyOfStrategy, CodegenOneOfStrategy, CodegenLogLevel, isCodegenInterfaceSchema, isCodegenWrapperSchema, CodegenSchema, CodegenSchemaPurpose, CodegenContentEncodingType } from '@openapi-generator-plus/types'
 import { CodegenOptionsJava } from './types'
 import path from 'path'
 import Handlebars from 'handlebars'
@@ -612,6 +612,24 @@ export default function createGenerator(config: CodegenConfig, context: JavaGene
 					return 'javax'
 				}
 			})
+
+			hbs.registerHelper('hasMultipartOperations', function() {
+				for (const group of doc.groups) {
+					for (const operation of group.operations) {
+						if (operation.requestBody?.contents) {
+							if (operation.requestBody.contents.find(content => content.encoding?.type === CodegenContentEncodingType.MULTIPART)) {
+								return true
+							}
+						}
+						if (operation.responses) {
+							if (idx.find(operation.responses, resp => !!resp.contents?.find(content => content.encoding?.type === CodegenContentEncodingType.MULTIPART))) {
+								return true
+							}
+						}
+					}
+				}
+				return false
+			})
 
 			await loadTemplates(path.resolve(__dirname, '..', 'templates'), hbs)
 			if (context.loadAdditionalTemplates) {

packages/java-jaxrs-common/templates/frag/bodyParam.hbs

@@ -9,4 +9,4 @@ required = true
 {{#if deprecated}}
 deprecated = true
 {{/if}}
-{{/join}}) {{/if}}{{{nativeType}}} {{identifier name}}
+{{/join}}) {{#ifeq defaultContent.encoding.type 'MULTIPART'}}@org.apache.cxf.jaxrs.ext.multipart.Multipart {{/ifeq}}{{/if}}{{{nativeType}}} {{identifier name}}

packages/java-jaxrs-server/templates/invoker.hbs

@@ -29,6 +29,9 @@ public abstract class Abstract{{invokerName}} extends {{javax}}.ws.rs.core.Appli
 
 	protected void addProviders() {
 		classes.add({{{apiProviderPackage}}}.ApiJaxbJsonProvider.class);
+		{{#if (hasMultipartOperations)}}
+		classes.add(org.apache.cxf.jaxrs.provider.MultipartProvider.class);
+		{{/if}}
 	}
 
 	protected void addEndpoints() {

packages/typescript-fetch-client/templates/api.hbs

@@ -125,6 +125,7 @@ export const {{className name}}ApiFetchParamCreator = function (configuration?:
 
 	{{/if}}
 	{{#with requestBody}}
+		{{#unless (isContentMultipart defaultContent)}}
 			{{#unless consumes}}
 			localVarHeaderParameter.set('Content-Type', 'application/json');
 			{{/unless}}
@@ -134,6 +135,7 @@ export const {{className name}}ApiFetchParamCreator = function (configuration?:
 			{{/if}}
 			{{/each}}
 
+		{{/unless}}
 	{{/with}}
 			localVarRequestOptions.headers = localVarHeaderParameter;
 	{{#if formParams}}

packages/typescript-fetch-client2/templates/api.hbs

@@ -91,6 +91,7 @@ export const {{className name}}ApiFetchParamCreator = function (configuration?:
 
 	{{/if}}
 	{{#with requestBody}}
+		{{#unless (isContentMultipart defaultContent)}}
 			{{#unless consumes}}
 			localVarHeaderParameter.set('Content-Type', 'application/json');
 			{{/unless}}
@@ -100,6 +101,7 @@ export const {{className name}}ApiFetchParamCreator = function (configuration?:
 			{{/if}}
 			{{/each}}
 
+		{{/uness}}
 	{{/with}}
 			localVarRequestOptions.headers = localVarHeaderParameter;
 	{{#if formParams}}