Commit a8d4cc9e authored by Noel Alonso's avatar Noel Alonso
Browse files

Actualiza referencias a orika

parent 253c435e

time-series-view/src/main/java/es/redmic/timeseriesview/converter/DirectionDatesConverter.java

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import es.redmic.models.es.geojson.common.model.Aggregations; 
import es.redmic.timeseriesview.dto.windrose.DatesByDirectionDTO;

import es.redmic.timeseriesview.dto.windrose.DatesByDirectionListDTO;

import ma.glasnost.orika.CustomConverter;

import ma.glasnost.orika.MappingContext;

import ma.glasnost.orika.metadata.Type;



/**
@@ -22,8 +23,8 @@ public class DirectionDatesConverter extends CustomConverter<Aggregations, Dates 


	@SuppressWarnings("unchecked")

	@Override

	public DatesByDirectionListDTO convert(Aggregations source,

			Type<? extends DatesByDirectionListDTO> destinationType) {

	public DatesByDirectionListDTO convert(Aggregations source, Type<? extends DatesByDirectionListDTO> destinationType,

			MappingContext mappingContext) {



		DatesByDirectionListDTO result = new DatesByDirectionListDTO();

time-series-view/src/main/java/es/redmic/timeseriesview/converter/WindroseSectorConverter.java

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import es.redmic.models.es.geojson.common.model.Aggregations; 
import es.redmic.timeseriesview.dto.windrose.WindroseItemDTO;

import es.redmic.timeseriesview.dto.windrose.WindroseSectorDTO;

import ma.glasnost.orika.CustomConverter;

import ma.glasnost.orika.MappingContext;

import ma.glasnost.orika.metadata.Type;



@Component
@@ -17,7 +18,8 @@ public class WindroseSectorConverter extends CustomConverter<Aggregations, Windr 


	@SuppressWarnings("unchecked")

	@Override

	public WindroseSectorDTO convert(Aggregations source, Type<? extends WindroseSectorDTO> destinationType) {

	public WindroseSectorDTO convert(Aggregations source, Type<? extends WindroseSectorDTO> destinationType,

			MappingContext mappingContext) {



		WindroseSectorDTO result = new WindroseSectorDTO();

time-series-view/src/main/java/es/redmic/timeseriesview/repository/WindRoseESRepository.java

+3 −2
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ public class WindRoseESRepository extends RTimeSeriesESRepository<TimeSeries, Da 
			throw new InternalException(ExceptionType.INTERNAL_EXCEPTION);

		}



		return mapper.getMapperFacade().convert(responseSectors.getAggregations(), DatesByDirectionListDTO.class, null);

		return mapper.getMapperFacade().convert(responseSectors.getAggregations(), DatesByDirectionListDTO.class, null,

				null);

	}



	@SuppressWarnings({ "serial" })
@@ -132,7 +133,7 @@ public class WindRoseESRepository extends RTimeSeriesESRepository<TimeSeries, Da 
		// para cada respuesta obtenemos los resultados de la agregación

		for (int i = 0; i < results.size(); i++) {

			WindroseSectorDTO dataSector = mapper.getMapperFacade().convert(results.get(i).getAggregations(),

					WindroseSectorDTO.class, null);

					WindroseSectorDTO.class, null, null);

			dataSector.calculateValue(count);

			windroseDataDTO.addSectorData(dataSector);

		}