Skip to content

Use correct getter method prefix for type "Boolean" #544

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
kwin merged 1 commit into from
Feb 12, 2026
+15 −4
Merged

Use correct getter method prefix for type "Boolean" #544

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
13 changes: 9 additions & 4 deletions ...ello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ private JMethod generateEquals(ModelClass modelClass) {

for (ModelField identifier : modelClass.getIdentifierFields(getGeneratedVersion())) {
String name = identifier.getName();
// for primitives reference field directly
if ("boolean".equals(identifier.getType())
|| "byte".equals(identifier.getType())
|| "char".equals(identifier.getType())
Expand All @@ -357,7 +358,10 @@ private JMethod generateEquals(ModelClass modelClass) {
|| "long".equals(identifier.getType())) {
sc.add("result = result && " + name + " == that." + name + ";");
} else {
name = "get" + capitalise(name) + "()";
// non-primitives use getters
JavaFieldMetadata javaFieldMetadata = (JavaFieldMetadata) identifier.getMetadata(JavaFieldMetadata.ID);
String prefix = getPrefix(javaFieldMetadata);
name = prefix + capitalise(name) + "()";
sc.add("result = result && ( " + name + " == null ? that." + name + " == null : " + name
+ ".equals( that." + name + " ) );");
}
Expand Down Expand Up @@ -396,10 +400,11 @@ private JMethod generateToString(ModelClass modelClass, boolean onlyIdentifierFi
for (Iterator<ModelField> j = fields.iterator(); j.hasNext(); ) {
ModelField identifier = j.next();

String getter = "boolean".equals(identifier.getType()) ? "is" : "get";
JavaFieldMetadata javaFieldMetadata = (JavaFieldMetadata) identifier.getMetadata(JavaFieldMetadata.ID);
String prefix = getPrefix(javaFieldMetadata);

sc.add("buf.append( \"" + identifier.getName() + " = '\" );");
sc.add("buf.append( " + getter + capitalise(identifier.getName()) + "() );");
sc.add("buf.append( " + prefix + capitalise(identifier.getName()) + "() );");
sc.add("buf.append( \"'\" );");

if (j.hasNext()) {
Expand Down Expand Up @@ -1173,7 +1178,7 @@ private JMethod createGetter(JField field, ModelField modelField) {

JavaFieldMetadata javaFieldMetadata = (JavaFieldMetadata) modelField.getMetadata(JavaFieldMetadata.ID);

String prefix = javaFieldMetadata.isBooleanGetter() ? "is" : "get";
String prefix = getPrefix(javaFieldMetadata);

JType returnType = field.getType();
String interfaceCast = "";
Expand Down
6 changes: 6 additions & 0 deletions modello-plugins/modello-plugin-java/src/test/resources/models/tostring.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<type>double</type>
<identifier>true</identifier>
</field>
<field>
<name>flag</name>
<version>1.0.0</version>
<type>Boolean</type>
<identifier>true</identifier>
</field>
</fields>
</class>
</classes>
Expand Down