Skip to content

Commit 16ec5eb

Browse files
micrycfrantuma
authored andcommitted
Add 'groovy.lang' to ModelConverters skipped packages
1 parent f6e7edd commit 16ec5eb

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

modules/swagger-core/src/main/java/io/swagger/v3/core/converter/ModelConverters.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class ModelConverters {
2525
private static ModelConverters SINGLETON31 = null;
2626
static Logger LOGGER = LoggerFactory.getLogger(ModelConverters.class);
2727
private final List<ModelConverter> converters;
28-
private final Set<String> skippedPackages = new HashSet<>();
28+
public final Set<String> skippedPackages = new HashSet<>();
2929
private final Set<String> skippedClasses = new HashSet<>();
3030

3131
public ModelConverters() {
@@ -58,7 +58,8 @@ public static ModelConverters getInstance(boolean openapi31) {
5858
}
5959

6060
private static void init(ModelConverters converter) {
61-
converter.skippedPackages.add("java.lang");
61+
converter.addPackageToSkip("java.lang");
62+
converter.addPackageToSkip("groovy.lang");
6263

6364
ServiceLoader<ModelConverter> loader = ServiceLoader.load(ModelConverter.class);
6465
Iterator<ModelConverter> itr = loader.iterator();

modules/swagger-core/src/test/java/io/swagger/v3/core/converting/ModelConverterTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,14 @@ public void indirectPropertiesRecognized() {
383383
assertEquals(model.getProperties().size(), 1);
384384
}
385385

386+
@Test
387+
public void checkDefaultSkippedPackages(){
388+
ModelConverters modelConverters = ModelConverters.getInstance();
389+
390+
assertTrue(modelConverters.skippedPackages.contains("java.lang"));
391+
assertTrue(modelConverters.skippedPackages.contains("groovy.lang"));
392+
}
393+
386394
@JsonSerialize(as = AnnotatedImplementationClass.class)
387395
abstract class BaseClass {
388396
public abstract String field();
@@ -406,6 +414,7 @@ public void directPropertiesRecognized() {
406414
assertEquals(model.getProperties().size(), 1);
407415
}
408416

417+
409418
abstract class AnnotatedBaseClass {
410419
@JsonProperty
411420
public abstract String field();

0 commit comments

Comments
 (0)