Commit d478340b authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

refactor: rename ServiceOrderAndServiceRepositories.java to ServiceRepositories

parent 5f3dbf73

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

+3 −3
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ import org.etsi.osl.hypo.core.common.telemetry.DeleteTelemetryData; 
import org.jboss.logging.Logger;



@ApplicationScoped

public class ServiceOrderAndServiceRepositories {

public class ServiceRepositories {



    private static final Logger logger = Logger.getLogger(ServiceOrderAndServiceRepositories.class);

    private static final Logger logger = Logger.getLogger(ServiceRepositories.class);

    public static final String NO_SERVICE_WITH_ID_S_WAS_FOUND_AND_UPDATE_IS_NOT_PERFORMED =

            "No service with id %s was found and update is not performed";
@@ -90,7 +90,7 @@ public class ServiceOrderAndServiceRepositories { 


    private static final String INVENTORY_WITH_ID = "Service with id ";



    public ServiceOrderAndServiceRepositories(

    public ServiceRepositories(

            ServiceInventoryRepository serviceInventoryRepository,

            ServiceBackUpRepository serviceBackUpRepository,

            ServiceOrderRepository serviceOrderRepository,

src/main/java/org/etsi/osl/hypo/api/tmf/services/inventory/api/rules/references/AddKubernetesSupportingResourceRule.java

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import static org.etsi.osl.hypo.api.tmf.services.inventory.api.rules.RulesConsta 


import jakarta.enterprise.context.ApplicationScoped;

import jakarta.inject.Inject;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceOrderAndServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.inventory.api.rules.annotations.BeforeCreateServiceExecution;

import org.etsi.osl.hypo.api.tmf.services.inventory.api.rules.facts.ServiceFacts;

import org.etsi.osl.hypo.api.tmf.services.inventory.schema.Service;
@@ -18,7 +18,7 @@ public class AddKubernetesSupportingResourceRule extends BasicRule { 


    private static final Logger logger = Logger.getLogger(AddKubernetesSupportingResourceRule.class);



    @Inject ServiceOrderAndServiceRepositories serviceOrderAndServiceRepositories;

    @Inject ServiceRepositories serviceRepositories;



    public AddKubernetesSupportingResourceRule() {

        this.name = this.getClass().getName();
@@ -42,7 +42,7 @@ public class AddKubernetesSupportingResourceRule extends BasicRule { 
    public void execute(Facts facts) {

        ServiceFacts serviceFacts = facts.get(FACTS);

        Service kubernetesService = serviceFacts.getService();

        serviceOrderAndServiceRepositories.createResourceReferences(kubernetesService);

        serviceRepositories.createResourceReferences(kubernetesService);



        logger.infof(

                "Executed rule %s for service with id %s ",

src/main/java/org/etsi/osl/hypo/api/tmf/services/inventory/api/rules/store/previous/service/StorePreviousServiceImageRule.java

+7 −9
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import static org.etsi.osl.hypo.api.tmf.services.inventory.api.rules.RulesConsta 
import jakarta.enterprise.context.ApplicationScoped;

import jakarta.inject.Inject;

import java.util.Objects;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceOrderAndServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.inventory.api.mappers.ServiceMapper;

import org.etsi.osl.hypo.api.tmf.services.inventory.api.rules.annotations.BeforeUpdateServiceExecution;

import org.etsi.osl.hypo.api.tmf.services.inventory.api.rules.facts.ServiceFacts;
@@ -21,14 +21,13 @@ public class StorePreviousServiceImageRule extends BasicRule { 


    private static final Logger logger = Logger.getLogger(StorePreviousServiceImageRule.class);



    private final ServiceOrderAndServiceRepositories serviceOrderAndServiceRepositories;

    private final ServiceRepositories serviceRepositories;

    private final ServiceMapper serviceMapper;



    @Inject

    public StorePreviousServiceImageRule(

            ServiceOrderAndServiceRepositories serviceOrderAndServiceRepositories,

            ServiceMapper serviceMapper) {

        this.serviceOrderAndServiceRepositories = serviceOrderAndServiceRepositories;

            ServiceRepositories serviceRepositories, ServiceMapper serviceMapper) {

        this.serviceRepositories = serviceRepositories;

        this.serviceMapper = serviceMapper;

        this.name = this.getClass().getName();

        this.description = "Rule for Evaluating if previous Image of the Service Should Be Stored";
@@ -60,7 +59,7 @@ public class StorePreviousServiceImageRule extends BasicRule { 
        servicePreviousStateHolder.setId(previousService.getId());

        servicePreviousStateHolder.setService(serviceBackUp);



        serviceOrderAndServiceRepositories.storeServiceBackup(servicePreviousStateHolder);

        serviceRepositories.storeServiceBackup(servicePreviousStateHolder);



        logger.infof(

                "Executed rule %s for service with id %s ",
@@ -87,12 +86,11 @@ public class StorePreviousServiceImageRule extends BasicRule { 
        if (!(o instanceof StorePreviousServiceImageRule that)) return false;

        if (!super.equals(o)) return false;



        return Objects.equals(

                serviceOrderAndServiceRepositories, that.serviceOrderAndServiceRepositories);

        return Objects.equals(serviceRepositories, that.serviceRepositories);

    }



    @Override

    public int hashCode() {

        return Objects.hash(super.hashCode(), serviceOrderAndServiceRepositories);

        return Objects.hash(super.hashCode(), serviceRepositories);

    }

}

src/main/java/org/etsi/osl/hypo/api/tmf/services/inventory/api/services/ServiceInventoryService.java

+24 −25
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import org.etsi.osl.hypo.api.tmf.common.api.constants.AlarmLogsConstants; 
import org.etsi.osl.hypo.api.tmf.common.exception.ServiceNotFoundException;

import org.etsi.osl.hypo.api.tmf.common.exception.UpdateStateNotAllowedException;

import org.etsi.osl.hypo.api.tmf.common.exception.ValidationException;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceOrderAndServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.common.model.ServiceDTO;

import org.etsi.osl.hypo.api.tmf.services.common.model.ServiceRefOrValue;

import org.etsi.osl.hypo.api.tmf.services.common.model.ServiceResponse;
@@ -47,19 +47,19 @@ import org.etsi.osl.hypo.core.common.telemetry.DeleteTelemetryData; 
@ApplicationScoped

public class ServiceInventoryService {



    private final ServiceOrderAndServiceRepositories serviceOrderAndServiceRepositories;

    private final ServiceRepositories serviceRepositories;

    private final ServiceCreateExistingKubernetesRuleEngine serviceCreateExistingKubernetesRuleEngine;

    private final ServiceUpdateRuleEngine serviceUpdateRuleEngine;

    private final ServiceDeleteRuleEngine serviceDeleteRuleEngine;

    private final ServiceMapper serviceMapper;



    public ServiceInventoryService(

            ServiceOrderAndServiceRepositories serviceOrderAndServiceRepositories,

            ServiceRepositories serviceRepositories,

            ServiceCreateExistingKubernetesRuleEngine serviceCreateExistingKubernetesRuleEngine,

            ServiceUpdateRuleEngine serviceUpdateRuleEngine,

            ServiceDeleteRuleEngine serviceDeleteRuleEngine,

            ServiceMapper serviceMapper) {

        this.serviceOrderAndServiceRepositories = serviceOrderAndServiceRepositories;

        this.serviceRepositories = serviceRepositories;

        this.serviceCreateExistingKubernetesRuleEngine = serviceCreateExistingKubernetesRuleEngine;

        this.serviceUpdateRuleEngine = serviceUpdateRuleEngine;

        this.serviceDeleteRuleEngine = serviceDeleteRuleEngine;
@@ -72,8 +72,7 @@ public class ServiceInventoryService { 
            Service service = serviceMapper.serviceRequestToEntity(serviceDTO);

            serviceCreateExistingKubernetesRuleEngine.applyBeforeRules(

                    service, authHeader, service.getServiceSpecification());

            ServiceResponse createdService =

                    serviceOrderAndServiceRepositories.createService(service, uriInfo);

            ServiceResponse createdService = serviceRepositories.createService(service, uriInfo);

            serviceCreateExistingKubernetesRuleEngine.applyAfterRules(createdService);

            return createdService;

        } catch (Exception e) {
@@ -84,32 +83,32 @@ public class ServiceInventoryService { 


    @WithSpan("ServiceInventoryService.getRelatedPartyEntityById")

    public Service getById(String id) {

        return serviceOrderAndServiceRepositories.getById(id);

        return serviceRepositories.getById(id);

    }



    public Optional<Service> getOptionalServiceById(String id) {

        return serviceOrderAndServiceRepositories.getOptionalServiceById(id);

        return serviceRepositories.getOptionalServiceById(id);

    }



    public Optional<Service> getOptionalServiceByIdWithLockWrite(String id) {

        return serviceOrderAndServiceRepositories.getOptionalServiceByIdWithLockWrite(id);

        return serviceRepositories.getOptionalServiceByIdWithLockWrite(id);

    }



    public ServiceResponse getByIdAndCriteria(String id, String fields, Map<String, String> params) {

        return serviceOrderAndServiceRepositories.getByIdAndCriteria(id, fields, params);

        return serviceRepositories.getByIdAndCriteria(id, fields, params);

    }



    public List<ServiceResponse> getByCriteria(String fields, Map<String, String> params) {

        return serviceOrderAndServiceRepositories.getServicesByCriteria(fields, params);

        return serviceRepositories.getServicesByCriteria(fields, params);

    }



    public List<ServiceWithPeeredOrganization> getServiceWithOrganizationByCriteria(

            String fields, Map<String, String> params) {

        return serviceOrderAndServiceRepositories.getServicesWithOrganizationByCriteria(fields, params);

        return serviceRepositories.getServicesWithOrganizationByCriteria(fields, params);

    }



    public Long countAllServices(Map<String, String> params) {

        return serviceOrderAndServiceRepositories.countAllServices(params);

        return serviceRepositories.countAllServices(params);

    }



    /**
@@ -120,13 +119,13 @@ public class ServiceInventoryService { 
     */

    @WithSpan("ServiceInventoryService.deleteService")

    public Service deleteService(String id) {

        return serviceOrderAndServiceRepositories.deleteService(id);

        return serviceRepositories.deleteService(id);

    }



    @WithSpan("ServiceInventoryService.deleteServiceFromRequest")

    @Transactional

    public void deleteServiceFromRequest(String id) {

        Service service = serviceOrderAndServiceRepositories.getServiceById(id);

        Service service = serviceRepositories.getServiceById(id);

        ServiceResponse serviceResponse = serviceMapper.serviceEntityToResponse(service);

        serviceDeleteRuleEngine.applyBeforeRules(service, service.getServiceSpecification());

        deleteService(id);
@@ -134,7 +133,7 @@ public class ServiceInventoryService { 
    }



    public void updateServiceById(String id, Service newService) {

        serviceOrderAndServiceRepositories.updateService(id, newService);

        serviceRepositories.updateService(id, newService);

    }



    @WithSpan("ServiceInventoryService.updateServiceFromRequest")
@@ -142,13 +141,13 @@ public class ServiceInventoryService { 
    public ServiceResponse updateServiceFromRequest(

            String id, ServiceDTO serviceDTO, String authHeader) {

        try {

            Service service = serviceOrderAndServiceRepositories.getServiceByIdWithLockWrite(id);

            Service service = serviceRepositories.getServiceByIdWithLockWrite(id);

            Service newService = serviceMapper.serviceRequestToEntity(serviceDTO);

            // execute rules

            ServiceFacts serviceFacts =

                    serviceUpdateRuleEngine.applyBeforeRules(service, newService, authHeader);

            serviceOrderAndServiceRepositories.updateService(serviceFacts.getServiceNewValues(), service);

            serviceOrderAndServiceRepositories.persistService(service);

            serviceRepositories.updateService(serviceFacts.getServiceNewValues(), service);

            serviceRepositories.persistService(service);

            ServiceResponse serviceResponse = serviceMapper.serviceEntityToResponse(service);

            ServiceFacts serviceFactsAfter = serviceUpdateRuleEngine.applyAfterRules(serviceResponse);

            // return service after updates
@@ -206,14 +205,14 @@ public class ServiceInventoryService { 
        optionalServiceById.ifPresent(

                serviceEntity -> {

                    addServiceNoteWithMessage(serviceEntity, messageNote);

                    serviceOrderAndServiceRepositories.persistService(serviceEntity);

                    serviceRepositories.persistService(serviceEntity);

                });



        return optionalServiceById.orElse(null);

    }



    public List<Service> findAllServices() {

        return serviceOrderAndServiceRepositories.findAllServices();

        return serviceRepositories.findAllServices();

    }



    public Uni<Void> handleSonataMessageServiceUpdate(
@@ -227,7 +226,7 @@ public class ServiceInventoryService { 
    public void updateServicesFromKafkaMessage(

            CloudEventServiceStateUpdate cloudEventServiceStateUpdate) throws ServiceNotFoundException {

        ServiceUpdateData serviceUpdateData = cloudEventServiceStateUpdate.getServiceUpdateData();

        serviceOrderAndServiceRepositories.updateServiceFromKafkaUpdateMessage(serviceUpdateData);

        serviceRepositories.updateServiceFromKafkaUpdateMessage(serviceUpdateData);

    }



    @WithSpan("ServiceInventoryService.updateServiceWithDashboardData")
@@ -235,7 +234,7 @@ public class ServiceInventoryService { 
            CloudEventResourceDashboard cloudEventResourceDashboard) {

        ResourceDashboardData resourceDashboardData =

                cloudEventResourceDashboard.getResourceDashboardData();

        serviceOrderAndServiceRepositories.createResourceWithDashboardData(resourceDashboardData);

        serviceRepositories.createResourceWithDashboardData(resourceDashboardData);

    }



    @WithSpan("ServiceInventoryService.updateServiceDeleteDashboardData")
@@ -243,7 +242,7 @@ public class ServiceInventoryService { 
            CloudEventDeleteServiceTelemetry cloudEventDeleteServiceTelemetry) {

        DeleteTelemetryData deleteTelemetryData =

                cloudEventDeleteServiceTelemetry.getDeleteTelemetryData();

        serviceOrderAndServiceRepositories.deleteResourceWithDashboardData(deleteTelemetryData);

        serviceRepositories.deleteResourceWithDashboardData(deleteTelemetryData);

    }



    public static String getServiceCharacteristicValue(
@@ -349,6 +348,6 @@ public class ServiceInventoryService { 
    }



    public void persistServices(Set<Service> servicesCFS) {

        serviceOrderAndServiceRepositories.persistServices(servicesCFS);

        serviceRepositories.persistServices(servicesCFS);

    }

}

src/main/java/org/etsi/osl/hypo/api/tmf/services/order/api/rules/persist/AddK8sResourceRefToEndUserReferenceRule.java

+7 −9
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import java.util.Objects; 
import java.util.Set;

import org.apache.commons.collections4.CollectionUtils;

import org.etsi.osl.hypo.api.tmf.common.model.ResourceRef;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceOrderAndServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.common.ServiceRepositories;

import org.etsi.osl.hypo.api.tmf.services.order.api.rules.annotations.NewServiceOrder;

import org.etsi.osl.hypo.api.tmf.services.order.api.rules.facts.ServiceOrderFacts;

import org.etsi.osl.hypo.api.tmf.services.order.model.common.ServiceOrderItem;
@@ -20,14 +20,13 @@ import org.jeasy.rules.core.BasicRule; 
@NewServiceOrder

public class AddK8sResourceRefToEndUserReferenceRule extends BasicRule {



    private final ServiceOrderAndServiceRepositories serviceOrderAndServiceRepositories;

    private final ServiceRepositories serviceRepositories;



    private static final Logger logger =

            Logger.getLogger(AddK8sResourceRefToEndUserReferenceRule.class);



    public AddK8sResourceRefToEndUserReferenceRule(

            ServiceOrderAndServiceRepositories serviceOrderAndServiceRepositories) {

        this.serviceOrderAndServiceRepositories = serviceOrderAndServiceRepositories;

    public AddK8sResourceRefToEndUserReferenceRule(ServiceRepositories serviceRepositories) {

        this.serviceRepositories = serviceRepositories;

        this.name = this.getClass().getName();

        this.description = "Rule for Creating Resource References from Service Order";

        this.priority = 12;
@@ -54,7 +53,7 @@ public class AddK8sResourceRefToEndUserReferenceRule extends BasicRule { 
        List<ServiceOrderItem> endUserItems = serviceOrderFacts.getEndUserItems();

        Set<ResourceRef> resourceRefs = serviceOrderFacts.getK8sResourceRefItems();



        serviceOrderAndServiceRepositories.createKubernetesResources(endUserItems, resourceRefs);

        serviceRepositories.createKubernetesResources(endUserItems, resourceRefs);

        logger.infof("Executed rule %s", this.getName());

    }
@@ -64,12 +63,11 @@ public class AddK8sResourceRefToEndUserReferenceRule extends BasicRule { 
        if (!(o instanceof AddK8sResourceRefToEndUserReferenceRule that)) return false;

        if (!super.equals(o)) return false;



        return Objects.equals(

                serviceOrderAndServiceRepositories, that.serviceOrderAndServiceRepositories);

        return Objects.equals(serviceRepositories, that.serviceRepositories);

    }



    @Override

    public int hashCode() {

        return Objects.hash(super.hashCode(), serviceOrderAndServiceRepositories);

        return Objects.hash(super.hashCode(), serviceRepositories);

    }

}