Skip to content

Commit cd87c31

Browse files
committed
Fix building the array of objects in the call to fromSearchDocs.
Also update the Jenkinsfile to use the 11.4 RPM.
1 parent be7d6c1 commit cd87c31

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ pipeline{
155155
}
156156
}
157157
steps {
158-
copyRPM 'Latest','11'
158+
copyRPM 'Latest','11.4'
159159
sh 'sudo /usr/local/sbin/mladmin removeforest /space/Forests'
160160
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
161-
copyConvertersRPM 'Latest','11'
161+
copyConvertersRPM 'Latest','11.4'
162162
setUpMLConverters '$WORKSPACE/xdmp/src/Mark*Converters*.rpm'
163163
sh label:'deploy test app', script: '''#!/bin/bash
164164
export JAVA_HOME=$JAVA_HOME_DIR
@@ -218,7 +218,7 @@ pipeline{
218218
}
219219
}
220220
steps {
221-
runAllTests('Latest', '11', false)
221+
runAllTests('Latest', '11.4', false)
222222
junit '**/build/**/TEST*.xml'
223223
}
224224
}
@@ -231,7 +231,7 @@ pipeline{
231231
}
232232
}
233233
steps {
234-
runAllTests('Latest', '11', true)
234+
runAllTests('Latest', '11.4', true)
235235
junit '**/build/**/TEST*.xml'
236236
}
237237
}

marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderSubImpl.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,11 @@ public PlanBuilder.AccessPlan fromSearchDocs(CtsQueryExpr query, String qualifie
6464
}
6565
@Override
6666
public PlanBuilder.AccessPlan fromSearchDocs(CtsQueryExpr query, String qualifierName, PlanSearchOptions options) {
67-
return new AccessPlanSubImpl(
68-
this, "op", "from-search-docs",
69-
new Object[]{
70-
query,
71-
(qualifierName == null) ? null : xs.string(qualifierName),
72-
asArg(makeMap(options))
73-
}
74-
);
67+
XsStringVal qualifierValue = qualifierName == null ? null : xs.string(qualifierName);
68+
Object[] args = options == null ?
69+
new Object[] {query, qualifierValue} :
70+
new Object[] {query, qualifierValue, asArg(makeMap(options))};
71+
return new AccessPlanSubImpl(this, "op", "from-search-docs", args);
7572
}
7673

7774
@Override

0 commit comments

Comments
 (0)