Commit 0d5f5d1c authored by Konstantinos Poulakakis's avatar Konstantinos Poulakakis
Browse files

refactor: change package for the policy grpc services. Add lombok library.... 

refactor: change package for the policy grpc services. Add lombok library. Make a parent class for PolicyRuleService and PolicyRuleDevice.
parent 0e5d886b

src/policy/pom.xml

+7 −0
Original line number Diff line number Diff line
@@ -152,6 +152,13 @@ 
            <artifactId>quarkus-config-yaml</artifactId>

        </dependency>



        <dependency>

            <groupId>org.projectlombok</groupId>

            <artifactId>lombok</artifactId>

            <version>1.18.30</version>

            <scope>provided</scope>

        </dependency>



        <!-- Testing -->

        <dependency>

            <groupId>org.assertj</groupId>

src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java

+15 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ import org.etsi.tfs.policy.context.model.ServiceTypeEnum; 
import org.etsi.tfs.policy.context.model.SliceId;

import org.etsi.tfs.policy.context.model.TopologyId;

import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType;

import org.etsi.tfs.policy.model.*;

import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor;

import org.etsi.tfs.policy.monitoring.model.AlarmResponse;

import org.etsi.tfs.policy.monitoring.model.AlarmSubscription;
@@ -101,6 +100,21 @@ import org.etsi.tfs.policy.monitoring.model.MonitorKpiRequest; 
import org.etsi.tfs.policy.monitoring.model.StringKpiValue;

import org.etsi.tfs.policy.monitoring.model.SubsDescriptor;

import org.etsi.tfs.policy.monitoring.model.SubsResponse;

import org.etsi.tfs.policy.policy.model.*;

import org.etsi.tfs.policy.policy.model.BooleanOperator;

import org.etsi.tfs.policy.policy.model.NumericalOperator;

import org.etsi.tfs.policy.policy.model.PolicyRule;

import org.etsi.tfs.policy.policy.model.PolicyRuleAction;

import org.etsi.tfs.policy.policy.model.PolicyRuleActionConfig;

import org.etsi.tfs.policy.policy.model.PolicyRuleActionEnum;

import org.etsi.tfs.policy.policy.model.PolicyRuleBasic;

import org.etsi.tfs.policy.policy.model.PolicyRuleCondition;

import org.etsi.tfs.policy.policy.model.PolicyRuleDevice;

import org.etsi.tfs.policy.policy.model.PolicyRuleService;

import org.etsi.tfs.policy.policy.model.PolicyRuleState;

import org.etsi.tfs.policy.policy.model.PolicyRuleStateEnum;

import org.etsi.tfs.policy.policy.model.PolicyRuleTypeDevice;

import org.etsi.tfs.policy.policy.model.PolicyRuleTypeService;

import policy.Policy;

import policy.Policy.PolicyRuleId;

import policy.PolicyAction;

src/policy/src/main/java/org/etsi/tfs/policy/common/ApplicationProperties.java

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package org.etsi.tfs.policy.common;



import org.etsi.tfs.policy.model.PolicyRuleState;

import org.etsi.tfs.policy.model.PolicyRuleStateEnum;

import org.etsi.tfs.policy.policy.model.PolicyRuleState;

import org.etsi.tfs.policy.policy.model.PolicyRuleStateEnum;



public class ApplicationProperties {

src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGateway.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import org.etsi.tfs.policy.context.model.Device; 
import org.etsi.tfs.policy.context.model.Empty;

import org.etsi.tfs.policy.context.model.Service;

import org.etsi.tfs.policy.context.model.ServiceId;

import org.etsi.tfs.policy.model.PolicyRule;

import org.etsi.tfs.policy.policy.model.PolicyRule;



public interface ContextGateway {

src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGatewayImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import org.etsi.tfs.policy.context.model.Device; 
import org.etsi.tfs.policy.context.model.Empty;

import org.etsi.tfs.policy.context.model.Service;

import org.etsi.tfs.policy.context.model.ServiceId;

import org.etsi.tfs.policy.model.PolicyRule;

import org.etsi.tfs.policy.policy.model.PolicyRule;



@ApplicationScoped

public class ContextGatewayImpl implements ContextGateway {