Merge pull request #28256 from vespa-engine/balder/upgrade-some-more-libs

- Update dependency org.jvnet.mimepull:mimepull to v1.10.0

4 files changed, 22 insertions, 24 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 0bf2610ae14..4eb6e080737 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -27,7 +27,6 @@ import com.yahoo.vespa.hosted.controller.security.Auth0Credentials;
 import com.yahoo.vespa.hosted.controller.security.CloudTenantSpec;
 import com.yahoo.vespa.hosted.controller.security.Credentials;
 import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -35,7 +34,6 @@ import java.io.File;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import static com.yahoo.application.container.handler.Request.Method.DELETE;
 import static com.yahoo.application.container.handler.Request.Method.GET;
@@ -471,13 +469,13 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
 
         String regexGenerateToken = "\\{\"id\":\"myTokenId\",\"token\":\"vespa_cloud_.*\",\"fingerprint\":\".*\"}";
         tester.assertResponse(request("/application/v4/tenant/scoober/token/myTokenId", POST).roles(Role.developer(tenantName)),
-                       (response) -> Assertions.assertThat(new String(response.getBody(), UTF_8)).matches(Pattern.compile(regexGenerateToken)),
+                       (response) -> assertTrue(new String(response.getBody(), UTF_8).matches(regexGenerateToken)),
                        200);
 
         String regexListTokens = "\\{\"tokens\":\\[\\{\"id\":\"myTokenId\",\"versions\":\\[\\{\"fingerprint\":\".*\",\"created\":\".*\",\"author\":\"user@test\",\"expiration\":\".*\"}]}]}";
         tester.assertResponse(request("/application/v4/tenant/scoober/token", GET)
                                       .roles(Role.developer(tenantName)),
-                              (response) -> Assertions.assertThat(new String(response.getBody(), UTF_8)).matches(Pattern.compile(regexListTokens)),
+                              (response) -> assertTrue(new String(response.getBody(), UTF_8).matches(regexListTokens)),
                               200);
 
         // Rejects invalid tokenIds on create
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenServiceTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenServiceTest.java
index e148eac7365..acfba03a700 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenServiceTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/dataplanetoken/DataplaneTokenServiceTest.java
@@ -15,8 +15,9 @@ import java.security.Principal;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static java.util.stream.Collectors.toSet;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -43,13 +44,13 @@ public class DataplaneTokenServiceTest {
         assertNotEquals(dataplaneToken1.fingerPrint(), dataplaneToken2.fingerPrint());
 
         List<DataplaneTokenVersions> dataplaneTokenVersions = dataplaneTokenService.listTokens(tenantName);
-        List<FingerPrint> tokenFingerprints = dataplaneTokenVersions.stream()
+        Set<FingerPrint> tokenFingerprints = dataplaneTokenVersions.stream()
                 .filter(token -> token.tokenId().equals(tokenId))
                 .map(DataplaneTokenVersions::tokenVersions)
                 .flatMap(Collection::stream)
                 .map(DataplaneTokenVersions.Version::fingerPrint)
-                .toList();
-        assertThat(tokenFingerprints).containsExactlyInAnyOrder(dataplaneToken1.fingerPrint(), dataplaneToken2.fingerPrint());
+                .collect(toSet());
+        assertEquals(tokenFingerprints, Set.of(dataplaneToken1.fingerPrint(), dataplaneToken2.fingerPrint()));
     }
 
     @Test
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResultTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResultTest.java
index d0d362abcfc..8d643534e0c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResultTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployResultTest.java
@@ -10,11 +10,12 @@ import com.yahoo.vespa.hosted.controller.integration.ZoneRegistryMock;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.Set;
 
 import static com.yahoo.vespa.hosted.controller.restapi.systemflags.SystemFlagsDeployResult.FlagDataChange;
 import static com.yahoo.vespa.hosted.controller.restapi.systemflags.SystemFlagsDeployResult.OperationError;
 import static com.yahoo.vespa.hosted.controller.restapi.systemflags.SystemFlagsDeployResult.merge;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bjorncs
@@ -29,17 +30,15 @@ public class SystemFlagsDeployResultTest {
         FlagId flagOne = new FlagId("flagone");
         FlagId flagTwo = new FlagId("flagtwo");
         SystemFlagsDeployResult result = new SystemFlagsDeployResult(
-                List.of(
-                        FlagDataChange.deleted(flagOne, controllerTarget)),
-                List.of(
-                        OperationError.deleteFailed("delete failed", controllerTarget, flagTwo)),
+                List.of(FlagDataChange.deleted(flagOne, controllerTarget)),
+                List.of(OperationError.deleteFailed("delete failed", controllerTarget, flagTwo)),
                 List.of());
         WireSystemFlagsDeployResult wire = result.toWire();
 
-        assertThat(wire.changes).hasSize(1);
-        assertThat(wire.changes.get(0).flagId).isEqualTo(flagOne.toString());
-        assertThat(wire.errors).hasSize(1);
-        assertThat(wire.errors.get(0).flagId).isEqualTo(flagTwo.toString());
+        assertEquals(1, wire.changes.size());
+        assertEquals(wire.changes.get(0).flagId, flagOne.toString());
+        assertEquals(1, wire.errors.size());
+        assertEquals(wire.errors.get(0).flagId, flagTwo.toString());
     }
 
     @Test
@@ -65,13 +64,13 @@ public class SystemFlagsDeployResultTest {
         SystemFlagsDeployResult mergedResult = merge(results);
 
         List<FlagDataChange> changes = mergedResult.flagChanges();
-        assertThat(changes).hasSize(1);
+        assertEquals(1, changes.size());
         FlagDataChange change = changes.get(0);
-        assertThat(change.targets()).containsOnly(controllerTarget, prodUsWest1Target);
+        assertEquals(change.targets(), Set.of(controllerTarget, prodUsWest1Target));
 
         List<OperationError> errors = mergedResult.errors();
-        assertThat(errors).hasSize(1);
+        assertEquals(1, errors.size());
         OperationError error = errors.get(0);
-        assertThat(error.targets()).containsOnly(controllerTarget, prodUsWest1Target);
+        assertEquals(error.targets(), Set.of(controllerTarget, prodUsWest1Target));
     }
 }
\ No newline at end of file
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java
index 8ad64a08244..cb330d28d22 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java
@@ -25,6 +25,7 @@ import static com.yahoo.vespa.hosted.controller.restapi.systemflags.SystemFlagsD
 import static com.yahoo.yolean.Exceptions.uncheck;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -174,7 +175,7 @@ public class SystemFlagsDeployerTest {
 
         assertThat(result.flagChanges()).containsOnly(
                 FlagDataChange.created(FLAG_ID, controllerTarget, defaultData));
-        assertThat(result.errors()).isEmpty();
+        assertTrue(result.errors().isEmpty());
     }
 
     @Test
@@ -209,8 +210,7 @@ public class SystemFlagsDeployerTest {
                 .build();
         SystemFlagsDeployer deployer = new SystemFlagsDeployer(flagsClient, SYSTEM, Set.of(controllerTarget));
         SystemFlagsDeployResult result = deployer.deployFlags(archive, false);
-        assertThat(result.flagChanges())
-                .isEmpty();
+        assertTrue(result.flagChanges().isEmpty());
         assertThat(result.errors())
                 .containsOnly(OperationError.archiveValidationFailed("Unknown flag file: flags/my-flag/main.prod.unknown-region.json"));
     }