Accept no test zip

3 files changed, 27 insertions, 26 deletions

diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index c6dfa0f8cb7..465f35e0b43 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -1588,30 +1588,31 @@ public class DeploymentSpecTest {
 
     @Test
     public void cloudAccount() {
-        StringReader r = new StringReader(
-                "<deployment version='1.0' cloud-account='100000000000'>" +
-                "    <instance id='alpha'>" +
-                "      <prod cloud-account='800000000000'>" +
-                "          <region>us-east-1</region>" +
-                "      </prod>" +
-                "    </instance>" +
-                "    <instance id='beta' cloud-account='200000000000'>" +
-                "      <staging cloud-account='600000000000'/>" +
-                "      <perf cloud-account='700000000000'/>" +
-                "      <prod>" +
-                "          <region>us-west-1</region>" +
-                "      </prod>" +
-                "    </instance>" +
-                "    <instance id='main'>" +
-                "      <test cloud-account='500000000000'/>" +
-                "      <dev cloud-account='400000000000'/>" +
-                "      <prod>" +
-                "          <region cloud-account='300000000000'>us-east-1</region>" +
-                "          <region>eu-west-1</region>" +
-                "      </prod>" +
-                "    </instance>" +
-                "</deployment>"
-        );
+        String r =
+                """
+                <deployment version='1.0' cloud-account='100000000000'>
+                    <instance id='alpha'>
+                      <prod cloud-account='800000000000'>
+                          <region>us-east-1</region>
+                      </prod>
+                    </instance>
+                    <instance id='beta' cloud-account='200000000000'>
+                      <staging cloud-account='600000000000'/>
+                      <perf cloud-account='700000000000'/>
+                      <prod>
+                          <region>us-west-1</region>
+                      </prod>
+                    </instance>
+                    <instance id='main'>
+                      <test cloud-account='500000000000'/>
+                      <dev cloud-account='400000000000'/>
+                      <prod>
+                          <region cloud-account='300000000000'>us-east-1</region>
+                          <region>eu-west-1</region>
+                      </prod>
+                    </instance>
+                </deployment>
+                """;
         DeploymentSpec spec = DeploymentSpec.fromXml(r);
         assertEquals(Optional.of(new CloudAccount("100000000000")), spec.cloudAccount());
         assertCloudAccount("800000000000", spec.requireInstance("alpha"), Environment.prod, "us-east-1");
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index d8acd2aa8b2..210c5793939 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2941,7 +2941,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
 
         ApplicationPackage applicationPackage = new ApplicationPackage(dataParts.get(EnvironmentResource.APPLICATION_ZIP), true);
 
-        byte[] testPackage = dataParts.get(EnvironmentResource.APPLICATION_TEST_ZIP);
+        byte[] testPackage = dataParts.getOrDefault(EnvironmentResource.APPLICATION_TEST_ZIP, new byte[0]);
         Submission submission = new Submission(applicationPackage, testPackage, sourceUrl, sourceRevision, authorEmail, description, risk);
 
         controller.applications().verifyApplicationIdentityConfiguration(TenantName.from(tenant),
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
index 9d27b103b6e..0f090f83c0b 100644
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
@@ -55,7 +55,7 @@ public class Reconfigurer extends AbstractComponent {
     }
 
     QuorumPeer startOrReconfigure(ZookeeperServerConfig newConfig, VespaZooKeeperServer server,
-                            Supplier<QuorumPeer> quorumPeerCreator) {
+                                  Supplier<QuorumPeer> quorumPeerCreator) {
         if (zooKeeperRunner == null) {
             peer = quorumPeerCreator.get(); // Obtain the peer from the server. This will be shared with later servers.
             zooKeeperRunner = startServer(newConfig, server);