forked from loafle/openapi-generator-original
Remove duplicated imports (#1414)
* remove duplicated imports * fix model import in java * update generator docs * fix model import for retrofit2 client
This commit is contained in:
parent
fd46b4e566
commit
7ce38aae38
@ -1032,13 +1032,16 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
|
||||
}
|
||||
|
||||
List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
|
||||
Set<String> mappingSet = new TreeSet<>();
|
||||
for (String nextImport : allImports) {
|
||||
Map<String, String> im = new LinkedHashMap<String, String>();
|
||||
String mapping = config.importMapping().get(nextImport);
|
||||
if (mapping == null) {
|
||||
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("classname", nextImport);
|
||||
if (!imports.contains(im)) { // avoid duplicates
|
||||
|
@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
|
||||
import org.threeten.bp.format.DateTimeFormatter;
|
||||
{{/threetenbp}}
|
||||
|
||||
{{#parent.length}}
|
||||
{{#models.0}}
|
||||
import {{modelPackage}}.*;
|
||||
{{/parent.length}}
|
||||
{{/models.0}}
|
||||
import okio.ByteString;
|
||||
|
||||
import java.io.IOException;
|
||||
|
@ -25,9 +25,9 @@ import org.threeten.bp.OffsetDateTime;
|
||||
import org.threeten.bp.format.DateTimeFormatter;
|
||||
{{/threetenbp}}
|
||||
|
||||
{{#parent.length}}
|
||||
{{#models.0}}
|
||||
import {{modelPackage}}.*;
|
||||
{{/parent.length}}
|
||||
{{/models.0}}
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
|
@ -1 +1 @@
|
||||
3.3.2-SNAPSHOT
|
||||
3.3.3-SNAPSHOT
|
@ -18,7 +18,6 @@ local basexx = require "basexx"
|
||||
-- model import
|
||||
local petstore_api_response = require "petstore.model.api_response"
|
||||
local petstore_pet = require "petstore.model.pet"
|
||||
local petstore_pet = require "petstore.model.pet"
|
||||
|
||||
local pet_api = {}
|
||||
local pet_api_mt = {
|
||||
|
@ -17,7 +17,6 @@ local basexx = require "basexx"
|
||||
|
||||
-- model import
|
||||
local petstore_order = require "petstore.model.order"
|
||||
local petstore_order = require "petstore.model.order"
|
||||
|
||||
local store_api = {}
|
||||
local store_api_mt = {
|
||||
|
@ -17,7 +17,6 @@ local basexx = require "basexx"
|
||||
|
||||
-- model import
|
||||
local petstore_user = require "petstore.model.user"
|
||||
local petstore_user = require "petstore.model.user"
|
||||
|
||||
local user_api = {}
|
||||
local user_api_mt = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user