loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Remove duplicated imports (#1414)

Browse Source 
* remove duplicated imports

* fix model import in java

* update generator docs

* fix model import for retrofit2 client
This commit is contained in:
William Cheng 2018-11-11 21:33:28 +08:00 committed by GitHub
parent fd46b4e566
commit 7ce38aae38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View File

@ -1032,13 +1032,16 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
} }
List<Map<String, String>> imports = new ArrayList<Map<String, String>>(); List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
Set<String> mappingSet = new TreeSet<>();
for (String nextImport : allImports) { for (String nextImport : allImports) {
Map<String, String> im = new LinkedHashMap<String, String>(); Map<String, String> im = new LinkedHashMap<String, String>();
String mapping = config.importMapping().get(nextImport); String mapping = config.importMapping().get(nextImport);
if (mapping == null) { if (mapping == null) {
mapping = config.toModelImport(nextImport); mapping = config.toModelImport(nextImport);
} }
if (mapping != null) {
if (mapping != null && !mappingSet.contains(mapping)) { // ensure import (mapping) is unique
mappingSet.add(mapping);
im.put("import", mapping); im.put("import", mapping);
im.put("classname", nextImport); im.put("classname", nextImport);
if (!imports.contains(im)) { // avoid duplicates if (!imports.contains(im)) { // avoid duplicates

4
modules/openapi-generator/src/main/resources/Java/JSON.mustache
View File

@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.format.DateTimeFormatter; import org.threeten.bp.format.DateTimeFormatter;
{{/threetenbp}} {{/threetenbp}}
{{#parent.length}} {{#models.0}}
import {{modelPackage}}.*; import {{modelPackage}}.*;
{{/parent.length}} {{/models.0}}
import okio.ByteString; import okio.ByteString;
import java.io.IOException; import java.io.IOException;

4
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache
View File

@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
import org.threeten.bp.format.DateTimeFormatter; import org.threeten.bp.format.DateTimeFormatter;
{{/threetenbp}} {{/threetenbp}}
{{#parent.length}} {{#models.0}}
import {{modelPackage}}.*; import {{modelPackage}}.*;
{{/parent.length}} {{/models.0}}
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;

2
samples/client/petstore/lua/.openapi-generator/VERSION
View File

@ -1 +1 @@
3.3.2-SNAPSHOT 3.3.3-SNAPSHOT

1
samples/client/petstore/lua/petstore/api/pet_api.lua
View File

@ -18,7 +18,6 @@ local basexx = require "basexx"
-- model import -- model import
local petstore_api_response = require "petstore.model.api_response" local petstore_api_response = require "petstore.model.api_response"
local petstore_pet = require "petstore.model.pet" local petstore_pet = require "petstore.model.pet"
local petstore_pet = require "petstore.model.pet"
local pet_api = {} local pet_api = {}
local pet_api_mt = { local pet_api_mt = {

1
samples/client/petstore/lua/petstore/api/store_api.lua
View File

@ -17,7 +17,6 @@ local basexx = require "basexx"
-- model import -- model import
local petstore_order = require "petstore.model.order" local petstore_order = require "petstore.model.order"
local petstore_order = require "petstore.model.order"
local store_api = {} local store_api = {}
local store_api_mt = { local store_api_mt = {

1
samples/client/petstore/lua/petstore/api/user_api.lua
View File

@ -17,7 +17,6 @@ local basexx = require "basexx"
-- model import -- model import
local petstore_user = require "petstore.model.user" local petstore_user = require "petstore.model.user"
local petstore_user = require "petstore.model.user"
local user_api = {} local user_api = {}
local user_api_mt = { local user_api_mt = {