Translators as stateless services producing immutable TranslatedXyz records

andrus · andrus · commit 0229d4581cdd · 2026-05-31T15:27:48.000-04:00
* EJBQL translators
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java
@@ -53,34 +53,34 @@ public EJBQLAction(EJBQLQuery query, SQLActionVisitor actionFactory, DataNode da
     @Override
     public void performAction(Connection connection, OperationObserver observer) throws Exception {
         EJBQLCompiledExpression compiledExpression = query.getExpression(dataNode.getEntityResolver());
-        EJBQLTranslator translatorFactory = dataNode.getEjbqlTranslator();
+        EJBQLTranslator translator = dataNode.getEjbqlTranslator();
         EJBQLTranslationContext context = new EJBQLTranslationContext(
                 dataNode.getEntityResolver(),
                 query,
                 compiledExpression,
-                translatorFactory,
+                translator,
                 dataNode.getAdapter(),
                 dataNode.getAdapter().getQuotingStrategy());
 
         compiledExpression.getExpression().visit(new EJBQLBaseVisitor(false) {
 
             @Override
             public boolean visitSelect(EJBQLExpression expression) {
-                EJBQLExpressionVisitor visitor = translatorFactory.getSelectTranslator(context);
+                EJBQLExpressionVisitor visitor = translator.getSelectTranslator(context);
                 expression.visit(visitor);
                 return false;
             }
 
             @Override
             public boolean visitDelete(EJBQLExpression expression) {
-                EJBQLExpressionVisitor visitor = translatorFactory.getDeleteTranslator(context);
+                EJBQLExpressionVisitor visitor = translator.getDeleteTranslator(context);
                 expression.visit(visitor);
                 return false;
             }
 
             @Override
             public boolean visitUpdate(EJBQLExpression expression) {
-                EJBQLExpressionVisitor visitor = translatorFactory.getUpdateTranslator(context);
+                EJBQLExpressionVisitor visitor = translator.getUpdateTranslator(context);
                 expression.visit(visitor);
                 return false;
             }
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java
@@ -76,7 +76,7 @@ protected void addMultiColumnOperand(EJBQLMultiColumnOperand operand) {
 
     @Override
     public boolean visitAggregate(EJBQLExpression expression) {
-        expression.visit(context.getTranslatorFactory().getAggregateColumnTranslator(context));
+        expression.visit(context.getTranslator().getAggregateColumnTranslator(context));
         return false;
     }
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDbPathTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDbPathTranslator.java
@@ -97,7 +97,7 @@ public boolean visitIdentificationVariable(EJBQLExpression expression) {
 
 	private void resolveJoin(boolean inner) {
 
-		EJBQLJoinAppender joinAppender = context.getTranslatorFactory().getJoinAppender(context);
+		EJBQLJoinAppender joinAppender = context.getTranslator().getJoinAppender(context);
 
 		// TODO: andrus 1/6/2007 - conflict with object path naming... maybe
 		// 'registerReusableJoin' should normalize everything to a db path?
@@ -237,7 +237,7 @@ public void setUsingAliases(boolean usingAliases) {
 
 	protected void resolveJoin() {
 
-		EJBQLJoinAppender joinAppender = context.getTranslatorFactory().getJoinAppender(context);
+		EJBQLJoinAppender joinAppender = context.getTranslator().getJoinAppender(context);
 
 		String newPath = idPath + '.' + lastPathComponent;
 		String oldPath = joinAppender.registerReusableJoin(idPath, lastPathComponent, newPath);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDeleteTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDeleteTranslator.java
@@ -43,14 +43,14 @@ public boolean visitDelete(EJBQLExpression expression) {
     @Override
     public boolean visitFrom(EJBQLExpression expression, int finishedChildIndex) {
         context.append(" FROM");
-        expression.visit(context.getTranslatorFactory().getFromTranslator(context));
+        expression.visit(context.getTranslator().getFromTranslator(context));
         return false;
     }
 
     @Override
     public boolean visitWhere(EJBQLExpression expression) {
         context.append(" WHERE");
-        expression.visit(context.getTranslatorFactory().getConditionTranslator(context));
+        expression.visit(context.getTranslator().getConditionTranslator(context));
         return false;
     }
 }
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLFromTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLFromTranslator.java
@@ -35,7 +35,7 @@ public class EJBQLFromTranslator extends EJBQLBaseVisitor {
     public EJBQLFromTranslator(EJBQLTranslationContext context) {
         super(true);
         this.context = context;
-        this.joinAppender = context.getTranslatorFactory().getJoinAppender(context);
+        this.joinAppender = context.getTranslator().getJoinAppender(context);
     }
 
     @Override
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLGroupByTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLGroupByTranslator.java
@@ -50,7 +50,7 @@ public boolean visitIdentifier(EJBQLExpression expression) {
             context.append(',');
         }
 
-        expression.visit(context.getTranslatorFactory().getIdentifierColumnsTranslator(context));
+        expression.visit(context.getTranslator().getIdentifierColumnsTranslator(context));
         return false;
     }
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdentifierColumnsTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdentifierColumnsTranslator.java
@@ -100,7 +100,7 @@ public boolean visitAttribute(AttributeProperty property) {
 
                         if (marker == null) {
                             marker = EJBQLJoinAppender.makeJoinTailMarker(idVar);
-                            joinAppender = context.getTranslatorFactory().getJoinAppender(context);
+                            joinAppender = context.getTranslator().getJoinAppender(context);
                         }
 
                         DbRelationship dr = (DbRelationship) pathPart;
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLJoinAppender.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLJoinAppender.java
@@ -256,7 +256,7 @@ public String appendTable(EJBQLTableId id) {
                 context.pushMarker(context.makeEntityQualifierMarker(), false);
 
                 ejbqlQualifier.visit(context
-                        .getTranslatorFactory()
+                        .getTranslator()
                         .getConditionTranslator(context));
 
                 context.popMarker();
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLOrderByTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLOrderByTranslator.java
@@ -52,7 +52,7 @@ public boolean visitDescending(EJBQLExpression expression) {
     
 	@Override
 	public boolean visitAggregate(EJBQLExpression expression) {
-		expression.visit(context.getTranslatorFactory().getAggregateColumnTranslator(context));
+		expression.visit(context.getTranslator().getAggregateColumnTranslator(context));
 		return false;
 	}
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLPathTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLPathTranslator.java
@@ -121,7 +121,7 @@ protected void resolveLastPathComponent(String pathComponent) {
 
 	protected void resolveJoin() {
 
-		EJBQLJoinAppender joinAppender = context.getTranslatorFactory().getJoinAppender(context);
+		EJBQLJoinAppender joinAppender = context.getTranslator().getJoinAppender(context);
 
 		String newPath = idPath + '.' + lastPathComponent;
 		String oldPath = joinAppender.registerReusableJoin(idPath, lastPathComponent, newPath);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectColumnsTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectColumnsTranslator.java
@@ -27,7 +27,6 @@
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 
 import java.util.Collection;
@@ -59,7 +58,7 @@ public boolean visitSelectExpression(EJBQLExpression expression) {
 
     @Override
     public boolean visitAggregate(EJBQLExpression expression) {
-        expression.visit(context.getTranslatorFactory().getAggregateColumnTranslator(context));
+        expression.visit(context.getTranslator().getAggregateColumnTranslator(context));
         return false;
     }
 
@@ -205,7 +204,7 @@ protected void processTerminatingAttribute(ObjAttribute attribute) {
 
     @Override
     public boolean visitIdentifier(EJBQLExpression expression) {
-        expression.visit(context.getTranslatorFactory().getIdentifierColumnsTranslator(context));
+        expression.visit(context.getTranslator().getIdentifierColumnsTranslator(context));
         return false;
     }
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslator.java
@@ -48,7 +48,7 @@ public boolean visitDistinct(EJBQLExpression expression) {
     public boolean visitFrom(EJBQLExpression expression, int finishedChildIndex) {
         context.append(" FROM");
         context.setAppendingResultColumns(false);
-        expression.visit(context.getTranslatorFactory().getFromTranslator(context));
+        expression.visit(context.getTranslator().getFromTranslator(context));
         context.markCurrentPosition(context.makeWhereMarker());
         context.markCurrentPosition(context.makeEntityQualifierMarker());
         return false;
@@ -57,21 +57,21 @@ public boolean visitFrom(EJBQLExpression expression, int finishedChildIndex) {
     @Override
     public boolean visitGroupBy(EJBQLExpression expression) {
         context.append(" GROUP BY");
-        expression.visit(context.getTranslatorFactory().getGroupByTranslator(context));
+        expression.visit(context.getTranslator().getGroupByTranslator(context));
         return false;
     }
 
     @Override
     public boolean visitHaving(EJBQLExpression expression) {
         context.append(" HAVING");
-        expression.visit(context.getTranslatorFactory().getConditionTranslator(context));
+        expression.visit(context.getTranslator().getConditionTranslator(context));
         return false;
     }
 
     @Override
     public boolean visitOrderBy(EJBQLExpression expression) {
         context.append(" ORDER BY");
-        expression.visit(context.getTranslatorFactory().getOrderByTranslator(context));
+        expression.visit(context.getTranslator().getOrderByTranslator(context));
         return false;
     }
 
@@ -92,7 +92,7 @@ public boolean visitSelectClause(EJBQLExpression expression) {
 
     @Override
     public boolean visitSelectExpressions(EJBQLExpression expression) {
-        expression.visit(context.getTranslatorFactory().getSelectColumnsTranslator(
+        expression.visit(context.getTranslator().getSelectColumnsTranslator(
                 context));
         return false;
     }
@@ -109,7 +109,7 @@ public boolean visitWhere(EJBQLExpression expression) {
             context.append(" AND");
         }
 
-        expression.visit(context.getTranslatorFactory().getConditionTranslator(context));
+        expression.visit(context.getTranslator().getConditionTranslator(context));
         return false;
     }
 
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java
@@ -42,15 +42,15 @@
 
 /**
  * A context used for translating of EJBQL to SQL.
- * 
+ *
  * @since 3.0
  */
 public class EJBQLTranslationContext {
 
     private EJBQLCompiledExpression compiledExpression;
     protected Map<String, Object> namedParameters;
     protected Map<Integer, Object> positionalParameters;
-    private EJBQLTranslator translatorFactory;
+    private EJBQLTranslator translator;
     private DbAdapter adapter;
     private QuotingStrategy quotingStrategy;
     private EntityResolver entityResolver;
@@ -73,17 +73,21 @@ public class EJBQLTranslationContext {
     // not.
     private boolean appendingResultColumns;
 
-    public EJBQLTranslationContext(EntityResolver entityResolver, EJBQLQuery query,
+    public EJBQLTranslationContext(
+            EntityResolver entityResolver,
+            EJBQLQuery query,
             EJBQLCompiledExpression compiledExpression,
-            EJBQLTranslator translatorFactory, DbAdapter adapter, QuotingStrategy quotingStrategy) {
+            EJBQLTranslator translator,
+            DbAdapter adapter,
+            QuotingStrategy quotingStrategy) {
 
         this.entityResolver = entityResolver;
         this.compiledExpression = compiledExpression;
         this.resultSetMetadata = query.getMetaData(entityResolver).getResultSetMapping();
 
         this.namedParameters = query.getNamedParameters();
         this.positionalParameters = query.getPositionalParameters();
-        this.translatorFactory = translatorFactory;
+        this.translator = translator;
         this.adapter = adapter;
         this.usingAliases = true;
         this.caseInsensitive = false;
@@ -118,8 +122,8 @@ public SQLTemplate getQuery() {
         query.setParams(boundParameters);
         return query;
     }
-    
-    public QueryMetadata getMetadata(){
+
+    public QueryMetadata getMetadata() {
         return queryMetadata;
     }
 
@@ -136,8 +140,8 @@ private String resolveId(String id) {
         return id;
     }
 
-    EJBQLTranslator getTranslatorFactory() {
-        return translatorFactory;
+    EJBQLTranslator getTranslator() {
+        return translator;
     }
 
     /**
@@ -174,8 +178,7 @@ List<DbRelationship> getIncomingRelationships(EJBQLTableId id) {
                         .getEntityDescriptor(id.getEntityId())
                         .getEntity()
                         .getDbEntity();
-            }
-            else {
+            } else {
                 DbRelationship last = incoming.get(incoming.size() - 1);
                 entity = last.getTargetEntity();
             }
@@ -354,16 +357,17 @@ List<String> bindNamedParameterFlatteningCollection(String name) {
      * <p>This method takes a value object which may be a collection or a non-collection.  If it
      * is a collection then it will bind all of the values in the collection.  If it is a non-
      * collection then it will bind that single object.</p>
+     *
      * @param value
      * @return
      */
 
     List<String> bindParameters(Object value) {
-        if(Collection.class.isAssignableFrom(value.getClass())) {
+        if (Collection.class.isAssignableFrom(value.getClass())) {
             Iterator<?> parameterValueIterator = ((Collection<?>) value).iterator();
             List<String> result = new ArrayList<>();
 
-            while(parameterValueIterator.hasNext()) {
+            while (parameterValueIterator.hasNext()) {
                 result.add(bindParameter(parameterValueIterator.next()));
             }
 
@@ -421,8 +425,7 @@ protected String getTableAlias(String idPath, String tableName) {
         if (dot > 0) {
             keyBuffer.append(idPath.substring(0, dot).toLowerCase()).append(
                     idPath.substring(dot));
-        }
-        else {
+        } else {
             keyBuffer.append(idPath.toLowerCase());
         }
 
@@ -432,8 +435,7 @@ protected String getTableAlias(String idPath, String tableName) {
 
         if (tableAliases != null) {
             alias = tableAliases.get(key);
-        }
-        else {
+        } else {
             tableAliases = new HashMap<>();
             alias = null;
         }
@@ -488,11 +490,11 @@ public boolean isUsingAliases() {
     public void setUsingAliases(boolean useAliases) {
         this.usingAliases = useAliases;
     }
-    
+
     public boolean isCaseInsensitive() {
         return caseInsensitive;
     }
-    
+
     public void setCaseInsensitive(boolean caseInsensitive) {
         this.caseInsensitive = caseInsensitive;
     }
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateTranslator.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateTranslator.java
@@ -48,13 +48,13 @@ public boolean visitUpdate(EJBQLExpression expression) {
     @Override
     public boolean visitWhere(EJBQLExpression expression) {
         context.append(" WHERE");
-        expression.visit(context.getTranslatorFactory().getConditionTranslator(context));
+        expression.visit(context.getTranslator().getConditionTranslator(context));
         return false;
     }
 
     @Override
     public boolean visitFrom(EJBQLExpression expression, int finishedChildIndex) {
-        expression.visit(context.getTranslatorFactory().getFromTranslator(context));
+        expression.visit(context.getTranslator().getFromTranslator(context));
 
         return false;
     }
@@ -68,7 +68,7 @@ public boolean visitUpdateItem(EJBQLExpression expression, int finishedChildInde
             context.append(" SET");
         }
 
-        expression.visit(context.getTranslatorFactory().getUpdateItemTranslator(context));
+        expression.visit(context.getTranslator().getUpdateItemTranslator(context));
         return false;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected void addMultiColumnOperand(EJBQLMultiColumnOperand operand) {`
`76`	`76`
`77`	`77`	`@Override`
`78`	`78`	`public boolean visitAggregate(EJBQLExpression expression) {`
`79`		`- expression.visit(context.getTranslatorFactory().getAggregateColumnTranslator(context));`
	`79`	`+ expression.visit(context.getTranslator().getAggregateColumnTranslator(context));`
`80`	`80`	`return false;`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ public boolean visitDelete(EJBQLExpression expression) {`
`43`	`43`	`@Override`
`44`	`44`	`public boolean visitFrom(EJBQLExpression expression, int finishedChildIndex) {`
`45`	`45`	`context.append(" FROM");`
`46`		`- expression.visit(context.getTranslatorFactory().getFromTranslator(context));`
	`46`	`+ expression.visit(context.getTranslator().getFromTranslator(context));`
`47`	`47`	`return false;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`public boolean visitWhere(EJBQLExpression expression) {`
`52`	`52`	`context.append(" WHERE");`
`53`		`- expression.visit(context.getTranslatorFactory().getConditionTranslator(context));`
	`53`	`+ expression.visit(context.getTranslator().getConditionTranslator(context));`
`54`	`54`	`return false;`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class EJBQLFromTranslator extends EJBQLBaseVisitor {`
`35`	`35`	`public EJBQLFromTranslator(EJBQLTranslationContext context) {`
`36`	`36`	`super(true);`
`37`	`37`	`this.context = context;`
`38`		`- this.joinAppender = context.getTranslatorFactory().getJoinAppender(context);`
	`38`	`+ this.joinAppender = context.getTranslator().getJoinAppender(context);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public boolean visitIdentifier(EJBQLExpression expression) {`
`50`	`50`	`context.append(',');`
`51`	`51`	`}`
`52`	`52`
`53`		`- expression.visit(context.getTranslatorFactory().getIdentifierColumnsTranslator(context));`
	`53`	`+ expression.visit(context.getTranslator().getIdentifierColumnsTranslator(context));`
`54`	`54`	`return false;`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public boolean visitAttribute(AttributeProperty property) {`
`100`	`100`
`101`	`101`	`if (marker == null) {`
`102`	`102`	`marker = EJBQLJoinAppender.makeJoinTailMarker(idVar);`
`103`		`- joinAppender = context.getTranslatorFactory().getJoinAppender(context);`
	`103`	`+ joinAppender = context.getTranslator().getJoinAppender(context);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`DbRelationship dr = (DbRelationship) pathPart;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public boolean visitDescending(EJBQLExpression expression) {`
`52`	`52`
`53`	`53`	`@Override`
`54`	`54`	`public boolean visitAggregate(EJBQLExpression expression) {`
`55`		`- expression.visit(context.getTranslatorFactory().getAggregateColumnTranslator(context));`
	`55`	`+ expression.visit(context.getTranslator().getAggregateColumnTranslator(context));`
`56`	`56`	`return false;`
`57`	`57`	`}`
`58`	`58`