Skip to content

Commit 55d99a6

Browse files
committed
DbAttribute: getJavaClass() -> getJavaClassName()
to address the assymetry with ObjAttribute.getJavaClass() that returns a Class
1 parent 97b2dc4 commit 55d99a6

5 files changed

Lines changed: 531 additions & 529 deletions

File tree

cayenne/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,6 @@ private String typeForGeneratedPK(DbAttribute key) {
308308
return attributeForDbAttribute.getType();
309309
}
310310
}
311-
return key.getJavaClass();
311+
return key.getJavaClassName();
312312
}
313313
}

cayenne/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public ColumnDescriptor(DbAttribute attribute, String tableAlias) {
9191

9292
this.attribute = attribute;
9393
this.namePrefix = tableAlias;
94-
this.javaClass = attribute.getJavaClass();
94+
this.javaClass = attribute.getJavaClassName();
9595

9696
if (attribute.getEntity() != null) {
9797
this.tableName = attribute.getEntity().getName();

cayenne/src/main/java/org/apache/cayenne/access/translator/select/ResultNodeDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public String getJavaType() {
106106
return property.getType().getCanonicalName();
107107
}
108108
if (getDbAttribute() != null) {
109-
return getDbAttribute().getJavaClass();
109+
return getDbAttribute().getJavaClassName();
110110
}
111111
return null;
112112
}

0 commit comments

Comments
 (0)