Commit 15fafe0e authored by Noel Alonso's avatar Noel Alonso
Browse files

Elimina componentes de ObjectCollectingSeries 

Se pasa estas funcionalidades a microservicio de timeseries
parent 5e81f5a2

src/main/java/es/redmic/es/maintenance/domain/administrative/taxonomy/service/ConfidenceESService.java

+5 −9
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import org.springframework.stereotype.Service; 
import es.redmic.es.common.service.DomainESService;

import es.redmic.es.geodata.citation.service.CitationESService;

import es.redmic.es.maintenance.domain.administrative.taxonomy.repository.ConfidenceESRepository;

import es.redmic.es.series.objectcollecting.service.ObjectCollectingSeriesESService;

import es.redmic.models.es.common.model.DomainES;

import es.redmic.models.es.common.model.ReferencesES;

import es.redmic.models.es.geojson.common.domain.dto.ConfidenceDTO;
@@ -37,9 +36,6 @@ public class ConfidenceESService extends DomainESService<DomainES, ConfidenceDTO 
	@Autowired

	CitationESService citationESService;



	@Autowired

	ObjectCollectingSeriesESService objectCollectingSeriesESService;



	@Autowired

	public ConfidenceESService(ConfidenceESRepository repository) {

		super(repository);
@@ -49,6 +45,6 @@ public class ConfidenceESService extends DomainESService<DomainES, ConfidenceDTO 
	public void postUpdate(ReferencesES<DomainES> reference) {



		citationESService.updateConfidence(reference);

		objectCollectingSeriesESService.updateConfidence(reference);

		//objectCollectingSeriesESService.updateConfidence(reference);

	}

}

src/main/java/es/redmic/es/maintenance/objects/service/ObjectTypeESService.java

+3 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import org.springframework.stereotype.Service; 


import es.redmic.es.common.service.HierarchicalESService;

import es.redmic.es.maintenance.objects.repository.ObjectTypeESRepository;

import es.redmic.es.series.objectcollecting.service.ObjectCollectingSeriesESService;

import es.redmic.models.es.common.model.ReferencesES;

import es.redmic.models.es.maintenance.objects.dto.ObjectClassificationDTO;

import es.redmic.models.es.maintenance.objects.dto.ObjectTypeDTO;
@@ -34,8 +33,8 @@ import es.redmic.models.es.maintenance.objects.model.ObjectType; 
@Service

public class ObjectTypeESService extends HierarchicalESService<ObjectType, ObjectTypeDTO> {



	@Autowired

	ObjectCollectingSeriesESService objectCollectingSeriesESService;

	//@Autowired

	//ObjectCollectingSeriesESService objectCollectingSeriesESService;



	@Autowired

	public ObjectTypeESService(ObjectTypeESRepository repository) {
@@ -52,6 +51,6 @@ public class ObjectTypeESService extends HierarchicalESService<ObjectType, Objec 


		super.postUpdate(reference);



		objectCollectingSeriesESService.updateObjectType(reference);

		//objectCollectingSeriesESService.updateObjectType(reference);

	}

}

src/main/java/es/redmic/es/series/common/converter/DataDefinitionConverter.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import ma.glasnost.orika.MappingContext; 
import ma.glasnost.orika.converter.BidirectionalConverter;

import ma.glasnost.orika.metadata.Type;



@Component

//@Component

public class DataDefinitionConverter extends BidirectionalConverter<Long, DataDefinitionDTO> {



	@Override

src/main/java/es/redmic/es/series/common/converter/DataHistogramConverter.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import es.redmic.models.es.series.timeseries.dto.DataHistogramItemDTO; 
import ma.glasnost.orika.MappingContext;

import ma.glasnost.orika.metadata.Type;



@Component

//@Component

public class DataHistogramConverter extends ClassificationConverterBase<Aggregations, DataHistogramDTO> {



	@SuppressWarnings("unchecked")

src/main/java/es/redmic/es/series/common/converter/ItemHistogramConverter.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import ma.glasnost.orika.MappingContext; 
import ma.glasnost.orika.metadata.Type;



@SuppressWarnings("rawtypes")

@Component

//@Component

public class ItemHistogramConverter extends CustomConverter<LinkedHashMap, DataHistogramItemDTO> {



	@Override