Skip to content

CAY-2790 EOModel import: NPE importing EOFetchSpecification #562

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
merged 1 commit into from
Mar 10, 2023
Merged

CAY-2790 EOModel import: NPE importing EOFetchSpecification #562

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
6 changes: 5 additions & 1 deletion modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
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;
Expand Down Expand Up @@ -248,6 +250,7 @@ static class EOFetchSpecificationParser {
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
Expand Down Expand Up @@ -473,7 +476,7 @@ static Expression makeQualifier(EOObjEntity entity, Map<String, ?> qualifierMap)
try {
keyExp = entity.translateToDbPath(keyExp);
} catch (Exception dbpathEx) {
return null;
logger.warn("Couldn't find " + keyExp + " in " + entity.getName() + " in EOModel");
}
}

Expand All @@ -484,6 +487,7 @@ static Expression makeQualifier(EOObjEntity entity, Map<String, ?> qualifierMap)
exp.setOperand(1, comparisonValue);
return exp;
} catch (ExpressionException e) {
logger.warn(e.getUnlabeledMessage());
return null;
}
}
Expand Down