1 files changed, 11 insertions, 21 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java
index c80299b4737..12669c2e952 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscContext.java
@@ -1,31 +1,21 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http.server.jetty;
 
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.http.ServerConfig;
 import com.yahoo.jdisc.service.CurrentContainer;
 
-public class JDiscContext {
-    final FilterResolver filterResolver;
-    final CurrentContainer container;
-    final Janitor janitor;
-    final Metric metric;
-    final ServerConfig serverConfig;
+record JDiscContext(FilterResolver filterResolver,
+                    CurrentContainer container,
+                    Janitor janitor,
+                    Metric metric,
+                    boolean developerMode,
+                    boolean removeRawPostBodyForWwwUrlEncodedPost) {
 
-    public JDiscContext(FilterBindings filterBindings,
-                        CurrentContainer container,
-                        Janitor janitor,
-                        Metric metric,
-                        ServerConfig serverConfig) {
-
-        this.filterResolver = new FilterResolver(filterBindings, metric, serverConfig.strictFiltering());
-        this.container = container;
-        this.janitor = janitor;
-        this.metric = metric;
-        this.serverConfig = serverConfig;
+    public static JDiscContext of(FilterBindings filterBindings, CurrentContainer container,
+                                  Janitor janitor, Metric metric, ServerConfig config) {
+        return new JDiscContext(new FilterResolver(filterBindings, metric), container, janitor,
+                                metric, config.developerMode(), config.removeRawPostBodyForWwwUrlEncodedPost());
     }
 
-    public boolean developerMode() {
-        return serverConfig.developerMode();
-    }
 }