[cayenne] branch master updated: CAY-2790 EOModel import: NPE importing EOFetchSpecification

[ntimofeev]

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

ntimofeev 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 472b2df59 CAY-2790 EOModel import: NPE importing EOFetchSpecification
     new 178c1c12b Merge pull request #562 from 
Ivan-nikitko/CAY-2790_EOModel_import_NPE_importing_EOFetchSpecification_master
472b2df59 is described below

commit 472b2df591b7d1b524d206e28f0aa4b0ac2bbf9f
Author: Ivan Nikitka <70625960+ivan-niki...@users.noreply.github.com>
AuthorDate: Wed Feb 1 15:24:16 2023 +0100

    CAY-2790 EOModel import: NPE importing EOFetchSpecification
---
 .../src/main/java/org/apache/cayenne/wocompat/EOQuery.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
 
b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
index 6aa22950c..c08c3da1d 100644
--- 
a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
+++ 
b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
@@ -31,6 +31,8 @@ import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.query.ObjectSelect;
 import org.apache.cayenne.query.PrefetchTreeNode;
 import org.apache.cayenne.query.SortOrder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -248,6 +250,7 @@ public class EOQuery<T> extends ObjectSelect<T> {
                private static final String OBJ_C = ":"; // Objective-C syntax 
addition.
 
                private static Map<String, Integer> selectorToExpressionBridge;
+               private static final Logger logger = 
LoggerFactory.getLogger(EOFetchSpecificationParser.class);
 
                /**
                 * selectorToExpressionBridge is just a mapping of EOModeler's 
selector
@@ -473,7 +476,7 @@ public class EOQuery<T> extends ObjectSelect<T> {
                                try {
                                        keyExp = 
entity.translateToDbPath(keyExp);
                                } catch (Exception dbpathEx) {
-                                       return null;
+                                       logger.warn("Couldn't find " + keyExp + 
" in " + entity.getName() + " in EOModel");
                                }
                        }
 
@@ -484,6 +487,7 @@ public class EOQuery<T> extends ObjectSelect<T> {
                                exp.setOperand(1, comparisonValue);
                                return exp;
                        } catch (ExpressionException e) {
+                               logger.warn(e.getUnlabeledMessage());
                                return null;
                        }
                }