Commit 2904ea9c authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '2-refactor-all-org-etsi-osl-model-references-to-org-etsi-osl-model-nfv' into 'develop'

Resolve "refactor all org.etsi.osl.model references to org.etsi.osl.model.nfv"

See merge request !1
parents 617b48dd e6ff1897

pom.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ 
		

		

		<dependency>

		<dependency>

			<groupId>org.etsi.osl</groupId>

			<groupId>org.etsi.osl</groupId>

			<artifactId>org.etsi.osl.model</artifactId>

			<artifactId>org.etsi.osl.model.nfv</artifactId>

			<version>${project.version}</version>

			<version>${project.version}</version>

		</dependency>

		</dependency>

src/main/java/org/etsi/osl/osom/OsomSpringBoot.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -26,16 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.boot.CommandLineRunner;

import org.springframework.boot.CommandLineRunner;

import org.springframework.boot.ExitCodeGenerator;

import org.springframework.boot.ExitCodeGenerator;

import org.springframework.boot.SpringApplication;

import org.springframework.boot.SpringApplication;

import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.boot.autoconfigure.domain.EntityScan;

import org.springframework.boot.context.properties.EnableConfigurationProperties;

//import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

//import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

//import org.springframework.cloud.context.config.annotation.RefreshScope;

//import org.springframework.cloud.context.config.annotation.RefreshScope;

import org.springframework.context.ApplicationContext;

import org.springframework.context.ApplicationContext;

import org.springframework.context.annotation.ComponentScan;

import org.springframework.context.annotation.ComponentScan.Filter;

import org.springframework.context.annotation.FilterType;





/**

/**

 * @author ctranoris

 * @author ctranoris

src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ package org.etsi.osl.osom.configuration; 
import org.apache.camel.component.activemq.ActiveMQComponent;

import org.apache.camel.component.activemq.ActiveMQComponent;

import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.Configuration;

import org.springframework.context.annotation.Configuration;



import jakarta.jms.ConnectionFactory;

import jakarta.jms.ConnectionFactory;





/**

/**

src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java

+5 −10
Original line number Original line Diff line number Diff line
@@ -25,21 +25,16 @@ import org.apache.camel.Exchange; 
import org.apache.camel.LoggingLevel;

import org.apache.camel.LoggingLevel;

import org.apache.camel.Processor;

import org.apache.camel.Processor;

import org.apache.camel.builder.RouteBuilder;

import org.apache.camel.builder.RouteBuilder;

import org.apache.camel.model.dataformat.JsonLibrary;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;

import org.apache.commons.logging.LogFactory;

import org.etsi.osl.osom.management.ServiceOrderManager;

import org.etsi.osl.model.nfv.ExperimentMetadata;

import org.etsi.osl.osom.serviceactions.ServiceActionCheck;

import org.etsi.osl.model.nfv.Product;

import org.etsi.osl.model.nfv.ValidationJob;

import org.etsi.osl.model.nfv.ValidationStatus;

import org.etsi.osl.model.nfv.VxFMetadata;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.context.annotation.Configuration;

import org.springframework.context.annotation.Configuration;

import org.springframework.stereotype.Component;

import org.springframework.stereotype.Component;

import org.etsi.osl.model.ExperimentMetadata;

import org.etsi.osl.model.Product;

import org.etsi.osl.model.ValidationJob;

import org.etsi.osl.model.ValidationStatus;

import org.etsi.osl.model.VxFMetadata;

import org.etsi.osl.tmf.am642.model.AlarmCreate;

import org.etsi.osl.tmf.so641.model.ServiceOrder;





@Configuration

@Configuration

//@RefreshScope

//@RefreshScope

src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -4,20 +4,18 @@ import java.io.IOException; 
import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;



import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.databind.ObjectMapper;



import org.apache.camel.ProducerTemplate;

import org.apache.camel.ProducerTemplate;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;

import org.apache.commons.logging.LogFactory;

import org.etsi.osl.osom.management.ServiceOrderManager;

import org.etsi.osl.osom.management.ServiceOrderManager;

import org.etsi.osl.tmf.lcm.model.ELCMRulePhase;

import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.stereotype.Service;

import org.springframework.stereotype.Service;

import org.etsi.osl.tmf.lcm.model.ELCMRulePhase;

import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification;





/**

/**

 * @author ctranoris

 * @author ctranoris