Merge pull request #8478 from john-french/addExtensionSupport

Add support for x-codegen-ignore and x-import-mapping extensions
swagger-api · Jul 25, 2018 · dbd0a4b · dbd0a4b
2 parents 9ede7b0 + 541198a
commit dbd0a4b
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -367,9 +367,11 @@ private Model getParent(Model model) {
                 Map<String, Model> modelMap = new HashMap<String, Model>();
                 modelMap.put(name, model);
                 Map<String, Object> models = processModels(config, modelMap, definitions);
-                models.put("classname", config.toModelName(name));
-                models.putAll(config.additionalProperties());
-                allProcessedModels.put(name, models);
+                if (models != null) {
+                    models.put("classname", config.toModelName(name));
+                    models.putAll(config.additionalProperties());
+                    allProcessedModels.put(name, models);
+                }
             } catch (Exception e) {
                 String message = "Could not process model '" + name + "'" + ". Please make sure that your schema is correct!";
                 LOGGER.error(message, e);
@@ -1016,6 +1018,16 @@ private Map<String, Object> processModels(CodegenConfig config, Map<String, Mode
         Set<String> allImports = new LinkedHashSet<String>();
         for (String key : definitions.keySet()) {
             Model mm = definitions.get(key);
+            if(mm.getVendorExtensions() !=  null && mm.getVendorExtensions().containsKey("x-codegen-ignore")) {
+                // skip this model
+                LOGGER.debug("skipping model " + key);
+                return null;
+            }
+            else if(mm.getVendorExtensions() !=  null && mm.getVendorExtensions().containsKey("x-codegen-import-mapping")) {
+                String codegenImport = mm.getVendorExtensions().get("x-codegen-import-mapping").toString();
+                config.importMapping().put(key, codegenImport);
+                allImports.add(codegenImport);
+            }
             CodegenModel cm = config.fromModel(key, mm, allDefinitions);
             Map<String, Object> mo = new HashMap<String, Object>();
             mo.put("model", cm);