Commit affc24e3 authored by Diogo Santos's avatar Diogo Santos
Browse files

Moved each validator to its respective package

parent aa725972

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

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecificationCreate; 
import org.etsi.osl.tmf.scm633.model.ServiceSpecificationUpdate;

import org.etsi.osl.tmf.scm633.reposervices.ServiceSpecificationRepoService;

import org.etsi.osl.tmf.util.AddUserAsOwnerToRelatedParties;

import org.etsi.osl.tmf.util.ServiceSpecificationValidator;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

src/main/java/org/etsi/osl/tmf/util/ServiceSpecificationValidator.java→src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationValidator.java

+2 −1
Original line number Diff line number Diff line 
package org.etsi.osl.tmf.util;

package org.etsi.osl.tmf.scm633.api;



import org.etsi.osl.tmf.scm633.model.ServiceSpecificationUpdate;

import org.etsi.osl.tmf.util.ServiceSpecCharacteristicValueValidator;

import org.springframework.stereotype.Component;

import org.springframework.validation.Errors;

import org.springframework.validation.Validator;

src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java

+2 −4
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import org.etsi.osl.tmf.sim638.model.ServiceCreate; 
import org.etsi.osl.tmf.sim638.model.ServiceUpdate;

import org.etsi.osl.tmf.sim638.service.ServiceRepoService;

import org.etsi.osl.tmf.util.AddUserAsOwnerToRelatedParties;

import org.etsi.osl.tmf.util.ServiceInventoryValidator;

import org.etsi.osl.tmf.util.ServiceSpecificationValidator;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;
@@ -66,12 +64,12 @@ public class ServiceApiController implements ServiceApi { 
	ServiceRepoService serviceRepoService;



	@Autowired

	private ServiceInventoryValidator serviceInventoryValidator;

	private ServiceValidator serviceValidator;



	// Custom validation resulting from ServiceSpecCharacteristicValue range interval and type validation (https://labs.etsi.org/rep/groups/osl/code/-/epics/30)

	@InitBinder

	protected void initBinder(WebDataBinder binder) {

		binder.addValidators(serviceInventoryValidator);

		binder.addValidators(serviceValidator);

	}



	@org.springframework.beans.factory.annotation.Autowired

src/main/java/org/etsi/osl/tmf/util/ServiceInventoryValidator.java→src/main/java/org/etsi/osl/tmf/sim638/api/ServiceValidator.java

+4 −2
Original line number Diff line number Diff line 
package org.etsi.osl.tmf.util;

package org.etsi.osl.tmf.sim638.api;



import org.etsi.osl.tmf.common.model.service.Characteristic;

import org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristic;
@@ -6,6 +6,8 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecCharacteristicValue; 
import org.etsi.osl.tmf.scm633.model.ServiceSpecification;

import org.etsi.osl.tmf.scm633.reposervices.ServiceSpecificationRepoService;

import org.etsi.osl.tmf.sim638.model.ServiceUpdate;

import org.etsi.osl.tmf.util.CharacteristicParser;

import org.etsi.osl.tmf.util.ServiceSpecCharacteristicValueValidator;

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

import org.springframework.stereotype.Component;

import org.springframework.validation.Errors;
@@ -14,7 +16,7 @@ import org.springframework.validation.Validator; 
import java.util.Set;



@Component

public class ServiceInventoryValidator implements Validator {

public class ServiceValidator implements Validator {

    @Autowired

    private ServiceSpecificationRepoService serviceSpecificationRepoService;

src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderCreate; 
import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;

import org.etsi.osl.tmf.so641.reposervices.ServiceOrderRepoService;

import org.etsi.osl.tmf.util.AddUserAsOwnerToRelatedParties;

import org.etsi.osl.tmf.util.ServiceOrderValidator;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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