Refactor AaregClient: optimize environment filtering and simplify test setup #deploy-test-dolly-backend

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/AaregClient.java

@@ -61,8 +61,9 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
         if (!bestilling.getAareg().isEmpty() &&
                 bestilling.getAareg().stream().anyMatch(aareg -> nonNull(aareg.getArbeidsgiver()))) {
 
-            var miljoer = bestilling.getEnvironments();
-            miljoer.retainAll(MILJOER_SUPPORTED);
+            var miljoer = bestilling.getEnvironments().stream()
+                    .filter(MILJOER_SUPPORTED::contains)
+                    .collect(Collectors.toSet());
 
             if (dollyPerson.getBruker().getBrukertype() == Bruker.Brukertype.BANKID) {
                 miljoer = crossConnect(miljoer, Q1_AND_Q2);

apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregClientTest.java

@@ -29,8 +29,6 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.util.HashSet;
-
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -170,7 +168,7 @@ void gjenopprettArbeidsforhold_tidligereArbeidsforholdFinnesAktoerOrganisasjon_r
                 .arbeidsforholdId("1")
                 .isOppdatering(true)
                 .build()));
-        request.setEnvironments(new HashSet<>(singleton(ENV)));
+        request.setEnvironments(singleton(ENV));
 
         when(aaregConsumer.hentArbeidsforhold(IDENT, ENV, accessToken))
                 .thenReturn(Mono.just(buildArbeidsforhold(true)));