Skip to content

Commit 8ef7280

Browse files
committed
Ref #32998: add addRuntimeValuesAfterSpel to ContainerBackend
1 parent 9cd35a8 commit 8ef7280

5 files changed

Lines changed: 16 additions & 0 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/backend/IContainerBackend.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,7 @@ default Proxy addRuntimeValuesBeforeSpel(Authentication user, ProxySpec spec, Pr
104104
return proxy;
105105
}
106106

107+
default Proxy addRuntimeValuesAfterSpel(Authentication user, ProxySpec spec, Proxy proxy) throws ContainerProxyException {
108+
return proxy;
109+
}
107110
}

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/DefaultProxyDispatcher.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,9 @@ public Proxy addRuntimeValuesBeforeSpel(Authentication user, ProxySpec spec, Pro
7474
return containerBackend.addRuntimeValuesBeforeSpel(user, spec, proxy);
7575
}
7676

77+
@Override
78+
public Proxy addRuntimeValuesAfterSpel(Authentication user, ProxySpec spec, Proxy proxy) {
79+
return containerBackend.addRuntimeValuesAfterSpel(user, spec, proxy);
80+
}
81+
7782
}

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/IProxyDispatcher.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ default void stopProxy(Proxy proxy) throws ContainerProxyException {
4545
boolean supportsPause();
4646

4747
Proxy addRuntimeValuesBeforeSpel(Authentication user, ProxySpec spec, Proxy proxy);
48+
49+
Proxy addRuntimeValuesAfterSpel(Authentication user, ProxySpec spec, Proxy proxy);
4850
}

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/ProxySharingDispatcher.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ public Proxy addRuntimeValuesBeforeSpel(Authentication user, ProxySpec spec, Pro
214214
return proxy;
215215
}
216216

217+
@Override
218+
public Proxy addRuntimeValuesAfterSpel(Authentication user, ProxySpec spec, Proxy proxy) {
219+
return proxy;
220+
}
221+
217222
@EventListener
218223
public void onSeatAvailableEvent(SeatAvailableEvent event) {
219224
if (!Objects.equals(event.getSpecId(), proxySpec.getId())) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@ private Pair<ProxySpec, Proxy> prepareProxyForStart(Authentication user, Proxy p
434434

435435
// add the runtime values which depend on spel to be resolved (and thus cannot be used in spel expression)
436436
proxy = runtimeValueService.addRuntimeValuesAfterSpel(spec, proxy);
437+
proxy = proxyDispatcherService.getDispatcher(spec.getId()).addRuntimeValuesAfterSpel(user, spec, proxy);
437438

438439
// create container objects
439440
for (ContainerSpec containerSpec : spec.getContainerSpecs()) {

0 commit comments

Comments
 (0)