Ref #32571: remove null checks

Author: LEDfan

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

@@ -54,7 +54,6 @@
 import eu.openanalytics.containerproxy.service.leader.ILeaderService;
 import eu.openanalytics.containerproxy.spec.expression.SpecExpressionContext;
 import eu.openanalytics.containerproxy.spec.expression.SpecExpressionResolver;
-import eu.openanalytics.containerproxy.spec.expression.SpelContextObjectNotAvailableException;
 import eu.openanalytics.containerproxy.spec.expression.SpelException;
 import eu.openanalytics.containerproxy.spec.expression.SpelField;
 import eu.openanalytics.containerproxy.util.ExecutorServiceFactory;
@@ -419,7 +418,7 @@ private Runnable createDelegateProxyJob(DelegateProxy originalDelegateProxy) {
                         applicationEventPublisher.publishEvent(new SeatAvailableEvent(proxySpec.getId(), intendedProxyId));
                     }
                 }
-            } catch (SpelContextObjectNotAvailableException | SpelException ex) {
+            } catch (SpelException ex) {
                 // remove seats and other data
                 globalEventLoop.schedule(() -> markDelegateProxyForRemoval(id));
                 logger.error("Failed to start DelegateProxy, problem while resolving SpEL expressions. You can only use the objects 'containerSpec', 'proxySpec' and 'proxy' when using pre-initialized containers. Cause: " + ex.getMessage());

src/main/java/eu/openanalytics/containerproxy/spec/expression/SpecExpressionContext.java

@@ -149,73 +149,4 @@ public SpecExpressionContext copy(Object... objects) {
         return create(toBuilder(), objects);
     }
 
-    public ProxySpec getProxySpec() {
-        if (proxySpec == null) {
-            throw new SpelContextObjectNotAvailableException("proxySpec");
-        }
-        return proxySpec;
-    }
-
-    public ContainerSpec getContainerSpec() {
-        if (containerSpec == null) {
-            throw new SpelContextObjectNotAvailableException("containerSpec");
-        }
-        return containerSpec;
-    }
-
-    public Proxy getProxy() {
-        if (proxy == null) {
-            throw new SpelContextObjectNotAvailableException("proxy");
-        }
-        return proxy;
-    }
-
-    public OpenIDAuthenticationBackend.CustomNameOidcUser getOidcUser() {
-        if (oidcUser == null) {
-            throw new SpelContextObjectNotAvailableException("oidcUser");
-        }
-        return oidcUser;
-    }
-
-    public ResponseAuthenticationConverter.Saml2AuthenticatedPrincipal getSamlCredential() {
-        if (samlCredential == null) {
-            throw new SpelContextObjectNotAvailableException("samlCredential");
-        }
-        return samlCredential;
-    }
-
-    public LdapUserDetails getLdapUser() {
-        if (ldapUser == null) {
-            throw new SpelContextObjectNotAvailableException("ldapUser");
-        }
-        return ldapUser;
-    }
-
-    public WebServiceAuthenticationBackend.WebServiceUser getWebServiceUser() {
-        if (webServiceUser == null) {
-            throw new SpelContextObjectNotAvailableException("webServiceUser");
-        }
-        return webServiceUser;
-    }
-
-    public List<String> getGroups() {
-        if (groups == null) {
-            throw new SpelContextObjectNotAvailableException("groups");
-        }
-        return groups;
-    }
-
-    public String getUserId() {
-        if (userId == null) {
-            throw new SpelContextObjectNotAvailableException("userId");
-        }
-        return userId;
-    }
-
-    public JsonNode getJson() {
-        if (json == null) {
-            throw new SpelContextObjectNotAvailableException("json");
-        }
-        return json;
-    }
 }

src/main/java/eu/openanalytics/containerproxy/spec/expression/SpecExpressionResolver.java

@@ -107,13 +107,7 @@ public <T> T evaluate(String expression, SpecExpressionContext context, Class<T>
             }
 
             return expr.getValue(sec, resType);
-        } catch (SpelContextObjectNotAvailableException ex) {
-            throw new SpelException(ex, expression);
         } catch (ExpressionException ex) {
-            Throwable rootCause = Throwables.getRootCause(ex);
-            if (rootCause instanceof SpelContextObjectNotAvailableException contextObjectNotAvailableException) {
-                throw new SpelContextObjectNotAvailableException(contextObjectNotAvailableException, expression);
-            }
             throw new SpelException(ex, expression);
         } catch (Throwable ex) {
             throw new SpelException(ex, expression);

src/main/java/eu/openanalytics/containerproxy/spec/expression/SpelContextObjectNotAvailableException.java

@@ -28,10 +28,6 @@ public SpelException(ExpressionException cause, String originalExpression) {
         super("Error while resolving expression: \"" + originalExpression + "\", error: " + cause.getMessage());
     }
 
-    public SpelException(SpelContextObjectNotAvailableException cause, String originalExpression) {
-        super("Error while resolving expression: \"" + originalExpression + "\", error: " + cause.getMessage());
-    }
-
     public SpelException(Throwable cause, String originalExpression) {
         super("Error while resolving expression: \"" + originalExpression + "\", error: " + cause.getMessage(), cause);
     }