Commit 205ed007 authored by Noel Alonso's avatar Noel Alonso
Browse files

Adapta componentes para usar mapstruct

parent fbb69f3a

atlas-view/src/main/java/es/redmic/atlasview/controller/category/CategoryController.java

+4 −7
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package es.redmic.atlasview.controller.category; 
 * #L%

 */



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

import org.mapstruct.factory.Mappers;

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

import org.springframework.kafka.annotation.KafkaHandler;

import org.springframework.kafka.annotation.KafkaListener;
@@ -36,7 +36,7 @@ import es.redmic.atlaslib.events.category.delete.DeleteCategoryConfirmedEvent; 
import es.redmic.atlaslib.events.category.delete.DeleteCategoryEvent;

import es.redmic.atlaslib.events.category.update.UpdateCategoryConfirmedEvent;

import es.redmic.atlaslib.events.category.update.UpdateCategoryEvent;

import es.redmic.atlasview.config.MapperScanBean;

import es.redmic.atlasview.mapper.category.CategoryESMapper;

import es.redmic.atlasview.model.category.Category;

import es.redmic.atlasview.service.category.CategoryESService;

import es.redmic.exception.common.ExceptionType;
@@ -52,9 +52,6 @@ public class CategoryController extends DataController<Category, CategoryDTO, Si 
	@Value("${broker.topic.category}")

	private String category_topic;



	@Autowired

	protected MapperScanBean mapper;



	CategoryESService service;



	public CategoryController(CategoryESService service) {
@@ -68,7 +65,7 @@ public class CategoryController extends DataController<Category, CategoryDTO, Si 
		EventApplicationResult result = null;



		try {

			result = service.save(mapper.getMapperFacade().map(event.getCategory(), Category.class));

			result = service.save(Mappers.getMapper(CategoryESMapper.class).map(event.getCategory()));

		} catch (Exception e) {

			e.printStackTrace();

			publishFailedEvent(CategoryEventFactory.getEvent(event, CategoryEventTypes.CREATE_FAILED,
@@ -90,7 +87,7 @@ public class CategoryController extends DataController<Category, CategoryDTO, Si 
		EventApplicationResult result = null;



		try {

			result = service.update(mapper.getMapperFacade().map(event.getCategory(), Category.class));

			result = service.update(Mappers.getMapper(CategoryESMapper.class).map(event.getCategory()));

		} catch (Exception e) {

			e.printStackTrace();

			publishFailedEvent(CategoryEventFactory.getEvent(event, CategoryEventTypes.UPDATE_FAILED,

atlas-view/src/main/java/es/redmic/atlasview/controller/themeinspire/ThemeInspireController.java

+4 −7
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package es.redmic.atlasview.controller.themeinspire; 
 * #L%

 */



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

import org.mapstruct.factory.Mappers;

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

import org.springframework.kafka.annotation.KafkaHandler;

import org.springframework.kafka.annotation.KafkaListener;
@@ -36,7 +36,7 @@ import es.redmic.atlaslib.events.themeinspire.delete.DeleteThemeInspireConfirmed 
import es.redmic.atlaslib.events.themeinspire.delete.DeleteThemeInspireEvent;

import es.redmic.atlaslib.events.themeinspire.update.UpdateThemeInspireConfirmedEvent;

import es.redmic.atlaslib.events.themeinspire.update.UpdateThemeInspireEvent;

import es.redmic.atlasview.config.MapperScanBean;

import es.redmic.atlasview.mapper.themeinspire.ThemeInspireESMapper;

import es.redmic.atlasview.model.themeinspire.ThemeInspire;

import es.redmic.atlasview.service.themeinspire.ThemeInspireESService;

import es.redmic.exception.common.ExceptionType;
@@ -52,9 +52,6 @@ public class ThemeInspireController extends DataController<ThemeInspire, ThemeIn 
	@Value("${broker.topic.theme-inspire}")

	private String theme_inspire_topic;



	@Autowired

	protected MapperScanBean mapper;



	ThemeInspireESService service;



	public ThemeInspireController(ThemeInspireESService service) {
@@ -68,7 +65,7 @@ public class ThemeInspireController extends DataController<ThemeInspire, ThemeIn 
		EventApplicationResult result = null;



		try {

			result = service.save(mapper.getMapperFacade().map(event.getThemeInspire(), ThemeInspire.class));

			result = service.save(Mappers.getMapper(ThemeInspireESMapper.class).map(event.getThemeInspire()));

		} catch (Exception e) {

			publishFailedEvent(ThemeInspireEventFactory.getEvent(event, ThemeInspireEventTypes.CREATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), theme_inspire_topic);
@@ -89,7 +86,7 @@ public class ThemeInspireController extends DataController<ThemeInspire, ThemeIn 
		EventApplicationResult result = null;



		try {

			result = service.update(mapper.getMapperFacade().map(event.getThemeInspire(), ThemeInspire.class));

			result = service.update(Mappers.getMapper(ThemeInspireESMapper.class).map(event.getThemeInspire()));

		} catch (Exception e) {

			publishFailedEvent(ThemeInspireEventFactory.getEvent(event, ThemeInspireEventTypes.UPDATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), theme_inspire_topic);

atlas-view/src/main/java/es/redmic/atlasview/service/category/CategoryESService.java

+24 −1
Original line number Diff line number Diff line 
package es.redmic.atlasview.service.category;



import org.mapstruct.factory.Mappers;



/*-

 * #%L

 * Atlas-query-endpoint
@@ -24,9 +26,15 @@ import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.stereotype.Service;



import es.redmic.atlaslib.dto.category.CategoryDTO;

import es.redmic.atlasview.mapper.category.CategoryESMapper;

import es.redmic.atlasview.model.category.Category;

import es.redmic.atlasview.repository.category.CategoryESRepository;

import es.redmic.models.es.common.dto.JSONCollectionDTO;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.data.common.model.DataHitWrapper;

import es.redmic.models.es.data.common.model.DataHitsWrapper;

import es.redmic.models.es.data.common.model.DataSearchWrapper;

import es.redmic.viewlib.data.dto.MetaDTO;

import es.redmic.viewlib.data.service.RWDataService;



@Service
@@ -36,4 +44,19 @@ public class CategoryESService extends RWDataService<Category, CategoryDTO, Simp 
	public CategoryESService(CategoryESRepository repository) {

		super(repository);

	}



	@Override

	protected MetaDTO<?> viewResultToDTO(DataHitWrapper<?> viewResult) {

		return Mappers.getMapper(CategoryESMapper.class).map(viewResult);

	}



	@Override

	protected JSONCollectionDTO viewResultToDTO(DataSearchWrapper<?> viewResult) {

		return Mappers.getMapper(CategoryESMapper.class).map(viewResult);

	}



	@Override

	protected JSONCollectionDTO viewResultToDTO(DataHitsWrapper<?> viewResult) {

		return Mappers.getMapper(CategoryESMapper.class).map(viewResult);

	}

}
 
 No newline at end of file

atlas-view/src/main/java/es/redmic/atlasview/service/layer/LayerESService.java

+24 −5
Original line number Diff line number Diff line 
package es.redmic.atlasview.service.layer;



import org.mapstruct.factory.Mappers;



/*-

 * #%L

 * Atlas-query-endpoint
@@ -24,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.stereotype.Service;



import es.redmic.atlaslib.dto.layer.LayerDTO;

import es.redmic.atlasview.mapper.layer.LayerESMapper;

import es.redmic.atlasview.model.layer.Layer;

import es.redmic.atlasview.model.layer.LayerWMS;

import es.redmic.atlasview.repository.layer.LayerESRepository;
@@ -31,6 +34,9 @@ import es.redmic.models.es.common.dto.EventApplicationResult; 
import es.redmic.models.es.common.dto.JSONCollectionDTO;

import es.redmic.models.es.common.query.dto.MgetDTO;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.data.common.model.DataHitWrapper;

import es.redmic.models.es.data.common.model.DataHitsWrapper;

import es.redmic.models.es.data.common.model.DataSearchWrapper;

import es.redmic.viewlib.data.dto.MetaDTO;

import es.redmic.viewlib.data.service.RDataService;
@@ -68,7 +74,7 @@ public class LayerESService extends RDataService<Layer, LayerDTO, SimpleQueryDTO 
	@Override

	public MetaDTO<?> findById(String id) {



		return mapper.getMapperFacade().map(repository.queryById(id), MetaDTO.class, getMappingContext());

		return viewResultToDTO(repository.queryById(id));

	}



	/**
@@ -78,8 +84,21 @@ public class LayerESService extends RDataService<Layer, LayerDTO, SimpleQueryDTO 
	@Override

	public JSONCollectionDTO mget(MgetDTO dto) {



		return mapper.getMapperFacade().map(

				repository.searchByIds(dto.getIds().stream().toArray(String[]::new)).getHits(),

				JSONCollectionDTO.class);

		return viewResultToDTO(repository.searchByIds(dto.getIds().stream().toArray(String[]::new)).getHits());

	}



	@Override

	protected MetaDTO<?> viewResultToDTO(DataHitWrapper<?> viewResult) {

		return Mappers.getMapper(LayerESMapper.class).map(viewResult);

	}



	@Override

	protected JSONCollectionDTO viewResultToDTO(DataSearchWrapper<?> viewResult) {

		return Mappers.getMapper(LayerESMapper.class).map(viewResult);

	}



	@Override

	protected JSONCollectionDTO viewResultToDTO(DataHitsWrapper<?> viewResult) {

		return Mappers.getMapper(LayerESMapper.class).map(viewResult);

	}

}
 
 No newline at end of file

atlas-view/src/main/java/es/redmic/atlasview/service/themeinspire/ThemeInspireESService.java

+24 −1
Original line number Diff line number Diff line 
package es.redmic.atlasview.service.themeinspire;



import org.mapstruct.factory.Mappers;



/*-

 * #%L

 * Atlas-query-endpoint
@@ -24,9 +26,15 @@ import org.springframework.beans.factory.annotation.Autowired; 
import org.springframework.stereotype.Service;



import es.redmic.atlaslib.dto.themeinspire.ThemeInspireDTO;

import es.redmic.atlasview.mapper.themeinspire.ThemeInspireESMapper;

import es.redmic.atlasview.model.themeinspire.ThemeInspire;

import es.redmic.atlasview.repository.themeinspire.ThemeInspireESRepository;

import es.redmic.models.es.common.dto.JSONCollectionDTO;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.data.common.model.DataHitWrapper;

import es.redmic.models.es.data.common.model.DataHitsWrapper;

import es.redmic.models.es.data.common.model.DataSearchWrapper;

import es.redmic.viewlib.data.dto.MetaDTO;

import es.redmic.viewlib.data.service.RWDataService;



@Service
@@ -36,4 +44,19 @@ public class ThemeInspireESService extends RWDataService<ThemeInspire, ThemeInsp 
	public ThemeInspireESService(ThemeInspireESRepository repository) {

		super(repository);

	}



	@Override

	protected MetaDTO<?> viewResultToDTO(DataHitWrapper<?> viewResult) {

		return Mappers.getMapper(ThemeInspireESMapper.class).map(viewResult);

	}



	@Override

	protected JSONCollectionDTO viewResultToDTO(DataSearchWrapper<?> viewResult) {

		return Mappers.getMapper(ThemeInspireESMapper.class).map(viewResult);

	}



	@Override

	protected JSONCollectionDTO viewResultToDTO(DataHitsWrapper<?> viewResult) {

		return Mappers.getMapper(ThemeInspireESMapper.class).map(viewResult);

	}

}
 
 No newline at end of file