From 81f67f3fff2567efc25a5e2b8c5c8bf9c60b259e Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Wed, 12 Oct 2022 18:02:34 +1100
Subject: [PATCH] remove getPreCompressedContentFormats from HttpContent

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../src/main/java/org/eclipse/jetty/http/HttpContent.java  | 7 -------
 .../org/eclipse/jetty/http/PrecompressedHttpContent.java   | 7 -------
 .../java/org/eclipse/jetty/server/ResourceService.java     | 2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
index ea0f359f7e3..c290d592e1d 100644
--- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
+++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
@@ -17,7 +17,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.time.Instant;
 import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.jetty.http.MimeTypes.Type;
 import org.eclipse.jetty.util.resource.Resource;
@@ -64,12 +63,6 @@ public interface HttpContent
 
     Map<CompressedContentFormat, ? extends HttpContent> getPrecompressedContents();
 
-    default Set<CompressedContentFormat> getPreCompressedContentFormats()
-    {
-        Map<CompressedContentFormat, ? extends HttpContent> precompressedContents = getPrecompressedContents();
-        return (precompressedContents == null) ? Set.of() : precompressedContents.keySet();
-    }
-
     ByteBuffer getBuffer();
 
     void release();
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/PrecompressedHttpContent.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/PrecompressedHttpContent.java
index 06fe0a3dd8e..4367ca0b4d5 100644
--- a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/PrecompressedHttpContent.java
+++ b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/PrecompressedHttpContent.java
@@ -16,7 +16,6 @@ package org.eclipse.jetty.http;
 import java.nio.ByteBuffer;
 import java.time.Instant;
 import java.util.Map;
-import java.util.Set;
 
 import org.eclipse.jetty.http.MimeTypes.Type;
 import org.eclipse.jetty.util.resource.Resource;
@@ -144,12 +143,6 @@ public class PrecompressedHttpContent implements HttpContent
         return null;
     }
 
-    @Override
-    public Set<CompressedContentFormat> getPreCompressedContentFormats()
-    {
-        return Set.of();
-    }
-
     @Override
     public ByteBuffer getBuffer()
     {
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
index 554eb1bdca6..5fc7a1083e7 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
@@ -204,7 +204,7 @@ public class ResourceService
             if (passConditionalHeaders(request, response, content, callback))
                 return;
 
-            if (!content.getPreCompressedContentFormats().isEmpty() || content instanceof PrecompressedHttpContent)
+            if (!_precompressedFormats.isEmpty())
                 response.getHeaders().put(HttpHeader.VARY, HttpHeader.ACCEPT_ENCODING.asString());
 
             HttpField contentEncoding = content.getContentEncoding();