Revert "Merge pull request #24750 from vespa-engine/jonmv/fix-test-packages"

This reverts commit 64ccea8d9a5b92ee6bd9312a31566a028e4464a3, reversing
changes made to 1a9ba093e5358c58765ed1df1a0dcade3c8d7c90.

1 files changed, 1 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
index f838e44bd02..bb24e70b96d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
@@ -56,7 +56,6 @@ import static com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPacka
 import static com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPackage.servicesFile;
 import static java.io.InputStream.nullInputStream;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.function.UnaryOperator.identity;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.toList;
@@ -112,7 +111,7 @@ public class TestPackage {
             @Override
             public InputStream modify(String name, InputStream in) {
                 hasLegacyTests |= name.startsWith("artifacts/") && name.endsWith("-tests.jar");
-                return entries.containsKey(name) ? null : replacements.getOrDefault(name, identity()).apply(in);
+                return entries.containsKey(name) ? null : replacements.get(name).apply(in);
             }
 
             {