Skip to content

Consistent error messaging for field names in query language #734

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

Open
al-niessner wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Consistent error messaging for field names in query language #734

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57efdec
always check field name
Mar 4, 2026
747a007
Update Antlr4SearchListener.java
al-niessner Mar 17, 2026
3cfe7c3
Update Antlr4SearchListener.java
al-niessner Mar 17, 2026
403dec4
Update Antlr4SearchListener.java
al-niessner Mar 17, 2026
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
23 changes: 14 additions & 9 deletions service/src/main/java/gov/nasa/pds/api/registry/model/Antlr4SearchListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ public void exitFields(SearchParser.FieldsContext ctx) {
if (ctx.ANY() != null) {
fieldname = ctx.ANY().getText();
}
if (fieldname.contains("*")) {
if (this.knownFieldNames.isEmpty()) {
try {
for (PropertiesListInner property : ProductsController.productPropertiesList(this.connectionContext).getBody()) {
this.knownFieldNames.add(property.getProperty());
}
} catch (OpenSearchException | IOException e) {
log.error("Could not load the mapping(s) from opensearch; meaning 'wildcarding' will not work", e);
if (this.knownFieldNames.isEmpty()) {
try {
for (PropertiesListInner property : ProductsController.productPropertiesList(this.connectionContext).getBody()) {
this.knownFieldNames.add(property.getProperty());
}
} catch (OpenSearchException | IOException e) {
throw new IllegalStateException("Could not load the mapping(s) from opensearch; meaning 'q=' with field names will not work", e);
}
}
if (fieldname.contains("*")) {
String theKey = fieldname.replace(".", "\\.").replace("*", ".*");
Pattern regex = Pattern.compile(theKey);
for (String fn : this.knownFieldNames.stream()
Expand All @@ -94,7 +94,12 @@ public void exitFields(SearchParser.FieldsContext ctx) {
throw new ParseCancellationException("Wildcarding request '" + fieldname + "' cannot match any field names in the LDD using regular expression " + theKey);
}
} else {
this.fieldNames.add(SearchUtil.jsonPropertyToOpenProperty(fieldname));
String fn = SearchUtil.jsonPropertyToOpenProperty(fieldname);
if (this.fieldNames.contains(fn) ) {
this.fieldNames.add(fn);
} else {
throw new ParseCancellationException("The request '" + fieldname + "' does match any field names in the LDD.");
}
}
this.isAnyWildcard = ctx.ALL() == null && this.fieldNames.size() > 1;
}
Expand Down
Loading