Always use base ServerModelResolver and add additional classes via co…

…nverterClasses config property.
noboomu · Apr 23, 2019 · 94b4dd4 · 94b4dd4
1 parent 6375bfa
commit 94b4dd4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
@@ -95,8 +95,8 @@ openapi {
     }
   ]
 
-  converters = [
-    "io.sinistral.proteus.openapi.jaxrs2.ServerModelResolver"
+  converterClasses = [
+
   ]
 }
 

diff --git a/openapi/src/main/java/io/sinistral/proteus/openapi/services/OpenAPIService.java b/openapi/src/main/java/io/sinistral/proteus/openapi/services/OpenAPIService.java
@@ -9,6 +9,7 @@
 import com.google.inject.name.Named;
 import com.typesafe.config.Config;
 import io.sinistral.proteus.openapi.jaxrs2.Reader;
+import io.sinistral.proteus.openapi.jaxrs2.ServerModelResolver;
 import io.sinistral.proteus.openapi.jaxrs2.ServerParameterExtension;
 import io.sinistral.proteus.server.endpoints.EndpointInfo;
 import io.sinistral.proteus.services.DefaultService;
@@ -254,7 +255,15 @@ protected void generateSpec() throws Exception
 
 		SwaggerConfiguration config = new SwaggerConfiguration().resourceClasses(classes.stream().map(Class::getName).collect(Collectors.toSet())).openAPI(openApi);
 
-		config.setModelConverterClassess(new HashSet<>( openAPIConfig.getStringList("converters") ));
+		Set<String> modelConverterClasses = new HashSet<>();
+
+		modelConverterClasses.add(ServerModelResolver.class.getName());
+
+		List<String> additionalConverterClasses = openAPIConfig.getStringList("converterClasses");
+
+		modelConverterClasses.addAll(additionalConverterClasses);
+
+		config.setModelConverterClassess(modelConverterClasses);
 
 		OpenApiContext ctx = new GenericOpenApiContext().openApiConfiguration(config)
 				.openApiReader(new Reader(config))

diff --git a/openapi/src/test/resources/application.conf b/openapi/src/test/resources/application.conf
@@ -33,7 +33,7 @@ application {
 
 api.version="v1"
 
-openapi.converters = ["io.sinistral.proteus.openapi.jaxrs2.ServerModelResolver","io.sinistral.proteus.openapi.test.converters.MoneyModelConverter"]
+openapi.converterClasses = ["io.sinistral.proteus.openapi.test.converters.MoneyModelConverter"]
 
 globalHeaders 
 {