Skip to content

Commit e475868

Browse files
committed
Ref #25533: throw error if parameters are expected but none are provided
1 parent 9d143b1 commit e475868

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/service/ParametersService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ public boolean validateRequest(ProxySpec resolvedSpec, ProvidedParameters provid
123123
return false;
124124
}
125125

126+
if (providedParameters == null) {
127+
throw new InvalidParametersException("No parameters provided, but proxy spec expects parameters");
128+
}
129+
126130
// check if correct number of parameters is provided
127131
if (providedParameters.size() != parameters.getIds().size()) {
128132
throw new InvalidParametersException("Invalid number of parameters provided");

src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,8 @@ public Proxy startProxy(ProxySpec spec, boolean ignoreAccessControl, List<Runtim
259259
if (runtimeValues != null) {
260260
proxy.addRuntimeValues(runtimeValues);
261261
}
262-
if (parameters != null) {
263-
if (parametersService.validateRequest(spec, parameters)) {
264-
proxy.addRuntimeValue(new RuntimeValue(ParametersKey.inst, parameters));
265-
}
262+
if (parametersService.validateRequest(spec, parameters)) {
263+
proxy.addRuntimeValue(new RuntimeValue(ParametersKey.inst, parameters));
266264
}
267265

268266
activeProxies.add(proxy);

0 commit comments

Comments
 (0)