Commit 05a2f97d authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

fix: instead of list, add an optional in method... 

fix: instead of list, add an optional in method ServiceOrderAndServiceRepositories.addKubernetesResourceReferenceToEndUserReference
parent 92310548

src/main/java/org/etsi/osl/hypo/api/tmf/services/common/ServiceOrderAndServiceRepositories.java

+13 −5
Original line number Diff line number Diff line
@@ -1298,16 +1298,24 @@ public class ServiceOrderAndServiceRepositories { 
        Optional<Service> kubernetesServiceOptional =

                serviceHelper.findServiceById(kubernetesServiceId);



        AtomicReference<Optional<ResourceRef>> resourceRefAtomicReference = new AtomicReference<>();

        resourceRefAtomicReference.set(Optional.empty());



        kubernetesServiceOptional.ifPresent(

                kubernetesService -> {

                    List<ResourceRef> resourceRefs =

                    // we expect at most one such resource reference, thus findFirst call suffices

                    Optional<ResourceRef> resourceRef =

                            kubernetesService.getSupportingResource().stream()

                                    .filter(getK8sResourceRefPredicate())

                                    .toList();

                    if (CollectionUtils.isNotEmpty(resourceRefs)) {

                        endUserReference.getSupportingResource().addAll(resourceRefs);

                    }

                                    .findFirst();



                    resourceRefAtomicReference.set(resourceRef);

                });



        Optional<ResourceRef> resourceRefOptional = resourceRefAtomicReference.get();



        resourceRefOptional.ifPresent(

                resourceRef -> endUserReference.getSupportingResource().add(resourceRef));

    }



    private static Predicate<ResourceRef> getK8sResourceRefPredicate() {