diff options
author | Danny van Bruggen <hexagonaal@gmail.com> | 2017-04-23 02:46:13 +0200 |
---|---|---|
committer | Danny van Bruggen <hexagonaal@gmail.com> | 2017-04-23 02:46:13 +0200 |
commit | 21d256cd2a82ab8d23611d583c44c14b44b68311 (patch) | |
tree | 1b7718f9ca3aed22b477164b026423645e6ecb4d /javaparser-core-generators/src/main/java | |
parent | e4610d5f3acd6d03bf51e8c70584a065d3233387 (diff) | |
download | javaparser-21d256cd2a82ab8d23611d583c44c14b44b68311.tar.gz |
Mark getters generated
Diffstat (limited to 'javaparser-core-generators/src/main/java')
-rw-r--r-- | javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java index 1074228c5..cf0a13177 100644 --- a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java +++ b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java @@ -54,7 +54,6 @@ public class PropertyGenerator extends NodeGenerator { if (property.getContainingNodeMetaModel().hasWildcard()) { setter.setType(parseType("T")); } - setter.getParameters().clear(); setter.addAndGetParameter(property.getTypeNameForSetter(), property.getName()) .addModifier(FINAL); @@ -92,17 +91,16 @@ public class PropertyGenerator extends NodeGenerator { } private void generateGetter(BaseNodeMetaModel nodeMetaModel, ClassOrInterfaceDeclaration nodeCoid, PropertyMetaModel property) { - final List<MethodDeclaration> getters = nodeCoid.getMethodsByName(property.getGetterMethodName()); - if (getters.size() != 1) { - throw new AssertionError(f("Not exactly one getter exists: %s.%s = %s", nodeMetaModel.getTypeName(), property.getName(), getters.size())); - } - final BlockStmt body = getters.get(0).getBody().get(); + final MethodDeclaration getter = new MethodDeclaration(EnumSet.of(PUBLIC), parseType(property.getTypeNameForGetter()), property.getGetterMethodName()); + final BlockStmt body = getter.getBody().get(); body.getStatements().clear(); if (property.isOptional()) { body.addStatement(f("return Optional.ofNullable(%s);", property.getName())); } else { body.addStatement(f("return %s;", property.getName())); } + replaceWhenSameSignature(nodeCoid, getter); + annotateGenerated(getter); } private void generateObservableProperty(EnumDeclaration observablePropertyEnum, PropertyMetaModel property, boolean derived) { |