(cayenne) branch master updated: cleanup

[aadamchik]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 22786ace2 cleanup
22786ace2 is described below

commit 22786ace2f0a20456685507422ae52f331388802
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Mon Jul 20 17:00:49 2026 +0200

    cleanup
---
 .../apache/cayenne/dbsync/naming/BaseObjectNameGenerator.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/BaseObjectNameGenerator.java
 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/BaseObjectNameGenerator.java
index f1073b261..e03e956a8 100644
--- 
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/BaseObjectNameGenerator.java
+++ 
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/BaseObjectNameGenerator.java
@@ -69,7 +69,10 @@ public abstract class BaseObjectNameGenerator implements 
ObjectNameGenerator {
         }
 
         String targetEntityName = 
joins.getFirst().getRelationship().getTargetEntityName();
-        return Util.underscoredToJava(relationshipBase(joins, 
targetEntityName, toMany), false);
+        String baseName = toMany
+                ? toManyBase(joins, targetEntityName)
+                : toOneBase(joins, targetEntityName);
+        return Util.underscoredToJava(baseName, false);
     }
 
     protected boolean isToMany(DbRelationship... relationshipChain) {
@@ -83,12 +86,6 @@ public abstract class BaseObjectNameGenerator implements 
ObjectNameGenerator {
         return false;
     }
 
-    protected String relationshipBase(List<DbJoin> joins, String 
targetEntityName, boolean toMany) {
-        return toMany
-                ? toManyBase(joins, targetEntityName)
-                : toOneBase(joins, targetEntityName);
-    }
-
     protected String toManyBase(List<DbJoin> joins, String targetEntityName) {
         String plural = 
EnglishInflector.pluralOf(dbEntityBaseName(targetEntityName).toLowerCase());
         String qualifier = toManyRoleQualifier(joins);