Non-functional changes

4 files changed, 85 insertions, 88 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
index b99d825a779..5c8f04e68ef 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
@@ -295,7 +295,7 @@ public class ApplicationPackage {
 
         private Map<Path, Optional<byte[]>> read(Collection<String> names) {
             var entries = ZipEntries.from(zip,
-                                          name -> names.contains(name),
+                                          names::contains,
                                           maxSize,
                                           true)
                                     .asList().stream()
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 5b20c57fcca..87d0e97fdf7 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
@@ -219,7 +219,7 @@ public class TestPackage {
     }
 
     /** Returns the generated services.xml content for the tester application. */
-    public static byte[] servicesXml(boolean systemUsesAthenz, boolean useTesterCertificate, boolean hasLegacyTests,
+    static byte[] servicesXml(boolean systemUsesAthenz, boolean useTesterCertificate, boolean hasLegacyTests,
                                      NodeResources resources, ControllerConfig.Steprunner.Testerapp config) {
         int jdiscMemoryGb = 2; // 2Gb memory for tester application which uses Maven.
         int jdiscMemoryPct = (int) Math.ceil(100 * jdiscMemoryGb / resources.memoryGb());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java
index 8cf861ff963..94e7c59e61e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java
@@ -3,18 +3,37 @@ package com.yahoo.vespa.hosted.controller.application.pkg;
 
 import com.yahoo.config.application.api.DeploymentSpec;
 import com.yahoo.config.application.api.ValidationId;
+import com.yahoo.security.KeyAlgorithm;
+import com.yahoo.security.KeyUtils;
+import com.yahoo.security.SignatureAlgorithm;
+import com.yahoo.security.X509CertificateBuilder;
 import org.junit.jupiter.api.Test;
 
+import javax.security.auth.x500.X500Principal;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.KeyPair;
+import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
+import static com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPackage.filesZip;
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -24,35 +43,41 @@ import static org.junit.jupiter.api.Assertions.fail;
  */
 public class ApplicationPackageTest {
 
-    static final String deploymentXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                                        "<deployment version=\"1.0\">\n" +
-                                        "    <test />\n" +
-                                        "    <prod>\n" +
-                                        "        <parallel>\n" +
-                                        "            <region active=\"true\">us-central-1</region>\n" +
-                                        "        </parallel>\n" +
-                                        "    </prod>\n" +
-                                        "</deployment>\n";
-
-    static final String servicesXml = "<services version='1.0' xmlns:deploy=\"vespa\" xmlns:preprocess=\"properties\">\n" +
-                                      "    <preprocess:include file='jdisc.xml' />\n" +
-                                      "    <content version='1.0' if='foo' />\n" +
-                                      "    <content version='1.0' id='foo' deploy:environment='staging prod' deploy:region='us-east-3 us-central-1'>\n" +
-                                      "        <preprocess:include file='content/content.xml' />\n" +
-                                      "    </content>\n" +
-                                      "    <preprocess:include file='not_found.xml' required='false' />\n" +
-                                      "</services>\n";
+    static final String deploymentXml = """
+                                        <?xml version="1.0" encoding="UTF-8"?>
+                                        <deployment version="1.0">
+                                            <test />
+                                            <prod>
+                                                <parallel>
+                                                    <region active="true">us-central-1</region>
+                                                </parallel>
+                                            </prod>
+                                        </deployment>
+                                        """;
+
+    static final String servicesXml = """
+                                      <services version='1.0' xmlns:deploy="vespa" xmlns:preprocess="properties">
+                                          <preprocess:include file='jdisc.xml' />
+                                          <content version='1.0' if='foo' />
+                                          <content version='1.0' id='foo' deploy:environment='staging prod' deploy:region='us-east-3 us-central-1'>
+                                              <preprocess:include file='content/content.xml' />
+                                          </content>
+                                          <preprocess:include file='not_found.xml' required='false' />
+                                      </services>
+                                      """;
 
     private static final String jdiscXml = "<container id='stateless' version='1.0' />\n";
 
-    private static final String contentXml = "<documents>\n" +
-                                             "    <document type=\"music.sd\" mode=\"index\" />\n" +
-                                             "</documents>\n" +
-                                             "<preprocess:include file=\"nodes.xml\" />";
+    private static final String contentXml = """
+                                             <documents>
+                                                 <document type="music.sd" mode="index" />
+                                             </documents>
+                                             <preprocess:include file="nodes.xml" />""";
 
-    private static final String nodesXml = "<nodes>\n" +
-                                           "    <node hostalias=\"node0\" distribution-key=\"0\" />\n" +
-                                           "</nodes>";
+    private static final String nodesXml = """
+                                           <nodes>
+                                               <node hostalias="node0" distribution-key="0" />
+                                           </nodes>""";
 
     @Test
     void test_createEmptyForDeploymentRemoval() {
@@ -67,22 +92,22 @@ public class ApplicationPackageTest {
 
     @Test
     void testMetaData() {
-        byte[] zip = ApplicationPackage.filesZip(Map.of("services.xml", servicesXml.getBytes(UTF_8),
-                "jdisc.xml", jdiscXml.getBytes(UTF_8),
-                "content/content.xml", contentXml.getBytes(UTF_8),
-                "content/nodes.xml", nodesXml.getBytes(UTF_8),
-                "gurba", "gurba".getBytes(UTF_8)));
+        byte[] zip = filesZip(Map.of("services.xml", servicesXml.getBytes(UTF_8),
+                                                        "jdisc.xml", jdiscXml.getBytes(UTF_8),
+                                                        "content/content.xml", contentXml.getBytes(UTF_8),
+                                                        "content/nodes.xml", nodesXml.getBytes(UTF_8),
+                                                        "gurba", "gurba".getBytes(UTF_8)));
 
         assertEquals(Map.of("services.xml", servicesXml,
-                        "jdisc.xml", jdiscXml,
-                        "content/content.xml", contentXml,
-                        "content/nodes.xml", nodesXml),
-                unzip(new ApplicationPackage(zip, false).metaDataZip()));
+                            "jdisc.xml", jdiscXml,
+                            "content/content.xml", contentXml,
+                            "content/nodes.xml", nodesXml),
+                     unzip(new ApplicationPackage(zip, false).metaDataZip()));
     }
 
     @Test
     void testMetaDataWithMissingFiles() {
-        byte[] zip = ApplicationPackage.filesZip(Map.of("services.xml", servicesXml.getBytes(UTF_8)));
+        byte[] zip = filesZip(Map.of("services.xml", servicesXml.getBytes(UTF_8)));
 
         try {
             new ApplicationPackage(zip, false).metaDataZip();
@@ -139,8 +164,30 @@ public class ApplicationPackageTest {
                                           entry -> new String(entry.contentOrThrow(), UTF_8)));
     }
 
-    private ApplicationPackage getApplicationZip(String path) throws Exception {
+    private ApplicationPackage getApplicationZip(String path) throws IOException {
         return new ApplicationPackage(Files.readAllBytes(Path.of("src/test/resources/application-packages/" + path)), true);
     }
 
+    @Test
+    void test_replacement() {
+        ApplicationPackage applicationPackage = new ApplicationPackage(new byte[0]);
+        List<X509Certificate> certificates = IntStream.range(0, 3)
+                                                      .mapToObj(i -> {
+                                                          KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256);
+                                                          X500Principal subject = new X500Principal("CN=subject" + i);
+                                                          return X509CertificateBuilder.fromKeypair(keyPair,
+                                                                                                    subject,
+                                                                                                    Instant.now(),
+                                                                                                    Instant.now().plusSeconds(1),
+                                                                                                    SignatureAlgorithm.SHA512_WITH_ECDSA,
+                                                                                                    BigInteger.valueOf(1))
+                                                                                       .build();
+                                                      }).toList();
+
+        assertEquals(List.of(), applicationPackage.trustedCertificates());
+        for (int i = 0; i < certificates.size(); i++) {
+            applicationPackage = applicationPackage.withTrustedCertificate(certificates.get(i));
+            assertEquals(certificates.subList(0, i + 1), applicationPackage.trustedCertificates());
+        }
+    }
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ZipEntriesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ZipEntriesTest.java
deleted file mode 100644
index 37062e1002b..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ZipEntriesTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.application.pkg;
-
-import com.yahoo.security.KeyAlgorithm;
-import com.yahoo.security.KeyUtils;
-import com.yahoo.security.SignatureAlgorithm;
-import com.yahoo.security.X509CertificateBuilder;
-import org.junit.jupiter.api.Test;
-
-import javax.security.auth.x500.X500Principal;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.cert.X509Certificate;
-import java.time.Instant;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * @author mpolden
- */
-public class ZipEntriesTest {
-
-    @Test
-    void test_replacement() {
-        ApplicationPackage applicationPackage = new ApplicationPackage(new byte[0]);
-        List<X509Certificate> certificates = IntStream.range(0, 3)
-                .mapToObj(i -> {
-                    KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256);
-                    X500Principal subject = new X500Principal("CN=subject" + i);
-                    return X509CertificateBuilder.fromKeypair(keyPair,
-                            subject,
-                            Instant.now(),
-                            Instant.now().plusSeconds(1),
-                            SignatureAlgorithm.SHA512_WITH_ECDSA,
-                            BigInteger.valueOf(1))
-                            .build();
-                })
-                .collect(Collectors.toUnmodifiableList());
-
-        assertEquals(List.of(), applicationPackage.trustedCertificates());
-        for (int i = 0; i < certificates.size(); i++) {
-            applicationPackage = applicationPackage.withTrustedCertificate(certificates.get(i));
-            assertEquals(certificates.subList(0, i + 1), applicationPackage.trustedCertificates());
-        }
-    }
-
-}