Commit 725e4278 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '3-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 85c46675 34eb0ef4

pom.xml

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


		<dependency>

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

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

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

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

		</dependency>

		<dependency>

src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestBody; 
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;



import org.etsi.osl.model.UserRoleType;

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

import io.swagger.v3.oas.annotations.Parameter;

import jakarta.servlet.http.HttpServletRequest;

import jakarta.validation.Valid;

src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RequestBody; 
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;



import org.etsi.osl.model.UserRoleType;

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

import io.swagger.v3.oas.annotations.Parameter;

import jakarta.servlet.http.HttpServletRequest;

import jakarta.validation.Valid;

src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder; 
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;



import org.etsi.osl.model.UserRoleType;

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

import jakarta.servlet.http.HttpServletRequest;

import jakarta.validation.Valid;

@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")

src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Value; 
import org.springframework.context.annotation.Configuration;

import org.springframework.stereotype.Component;



import org.etsi.osl.model.NetworkServiceDescriptor;

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



@Configuration

//@RefreshScope