Skip to content

Revert PR #45 #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2018
+13 −17
Merged

Revert PR #45 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
addProperties(allProperties, allRequired, child, allDefinitions);
}
}
addVars(m, properties, required, allProperties, allRequired, allDefinitions);
addVars(m, properties, required, allProperties, allRequired);
// TODO
//} else if (schema instanceof RefModel) {
} else {
Expand All @@ -1533,7 +1533,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
if (ModelUtils.isMapSchema(schema)) {
addAdditionPropertiesToCodeGenModel(m, schema);
}
addVars(m, schema.getProperties(), schema.getRequired(), allDefinitions);
addVars(m, schema.getProperties(), schema.getRequired());
}

if (m.vars != null) {
Expand Down Expand Up @@ -3095,12 +3095,12 @@ protected void addImport(CodegenModel m, String type) {
}
}

private void addVars(CodegenModel model, Map<String, Schema> properties, List<String> required, Map<String, Schema> allDefinitions) {
addVars(model, properties, required, null, null, allDefinitions);
private void addVars(CodegenModel model, Map<String, Schema> properties, List<String> required) {
addVars(model, properties, required, null, null);
}

private void addVars(CodegenModel m, Map<String, Schema> properties, List<String> required,
Map<String, Schema> allProperties, List<String> allRequired, Map<String, Schema> allDefinitions) {
Map<String, Schema> allProperties, List<String> allRequired) {

m.hasRequired = false;
if (properties != null && !properties.isEmpty()) {
Expand All @@ -3109,7 +3109,7 @@ private void addVars(CodegenModel m, Map<String, Schema> properties, List<String

Set<String> mandatory = required == null ? Collections.<String>emptySet()
: new TreeSet<String>(required);
addVars(m, m.vars, properties, mandatory, allDefinitions);
addVars(m, m.vars, properties, mandatory);
m.allMandatory = m.mandatory = mandatory;
} else {
m.emptyVars = true;
Expand All @@ -3120,24 +3120,20 @@ private void addVars(CodegenModel m, Map<String, Schema> properties, List<String
if (allProperties != null) {
Set<String> allMandatory = allRequired == null ? Collections.<String>emptySet()
: new TreeSet<String>(allRequired);
addVars(m, m.allVars, allProperties, allMandatory, allDefinitions);
addVars(m, m.allVars, allProperties, allMandatory);
m.allMandatory = allMandatory;
}
}

private void addVars(CodegenModel m, List<CodegenProperty> vars, Map<String, Schema> properties, Set<String> mandatory, Map<String, Schema> allDefinitions) {
private void addVars(CodegenModel m, List<CodegenProperty> vars, Map<String, Schema> properties, Set<String> mandatory) {
// convert set to list so that we can access the next entry in the loop
List<Map.Entry<String, Schema>> propertyList = new ArrayList<Map.Entry<String, Schema>>(properties.entrySet());
final int totalCount = propertyList.size();
for (int i = 0; i < totalCount; i++) {
Map.Entry<String, Schema> entry = propertyList.get(i);

final String key = entry.getKey();
Schema prop = entry.getValue();
if (allDefinitions != null && prop != null && StringUtils.isNotEmpty(prop.get$ref())) {
String refName = ModelUtils.getSimpleRef(prop.get$ref());
prop = allDefinitions.get(refName);
}
final Schema prop = entry.getValue();

if (prop == null) {
LOGGER.warn("null property for " + key);
Expand Down
8 changes: 4 additions & 4 deletions modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,11 +937,11 @@ public void stringPropertyReferencedInObjectTest() {
Assert.assertTrue(cp.isNotContainer);
Assert.assertFalse(cp.isLong);
Assert.assertFalse(cp.isInteger);
Assert.assertTrue(cp.isString);
// Assert.assertTrue(cp.isString); //TODO: issue swagger-api/swagger-codegen#8001
Assert.assertEquals(cp.getter, "getSomePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.minLength, Integer.valueOf(3));
Assert.assertEquals(cp.maxLength, Integer.valueOf(10));
Assert.assertEquals(cp.pattern, "^[A-Z]+$");
// Assert.assertEquals(cp.minLength, Integer.valueOf(3)); //TODO: issue swagger-api/swagger-codegen#8001
// Assert.assertEquals(cp.maxLength, Integer.valueOf(10)); //TODO: issue swagger-api/swagger-codegen#8001
// Assert.assertEquals(cp.pattern, "^[A-Z]+$"); //TODO: issue swagger-api/swagger-codegen#8001
}

@Test(description = "convert an array schema")
Expand Down