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

Actualiza código para adaptarse a nueva versión

parent 84430abc
Loading
Loading
Loading
Loading
+5 −10
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
@@ -43,11 +45,10 @@ import com.fasterxml.jackson.databind.Module;

import es.redmic.databaselib.common.repository.BaseRepositoryImpl;
import es.redmic.db.config.EntityManagerWrapper;
import es.redmic.tasks.config.OrikaScanBean;
import es.redmic.tasks.config.ResourceBundleMessageSource;
import io.micrometer.core.instrument.MeterRegistry;

@SpringBootApplication
@SpringBootApplication(exclude = { MongoAutoConfiguration.class, ElasticsearchAutoConfiguration.class })
@ComponentScan({ "es.redmic.tasks", "es.redmic.es", "es.redmic.databaselib", "es.redmic.db", "es.redmic.mediastorage",
		"es.redmic.brokerlib" })
@EnableJpaRepositories(basePackages = { "es.redmic.tasks", "es.redmic.databaselib",
@@ -77,12 +78,6 @@ public class TasksApplication {
		return new ResourceBundleMessageSource();
	}

	@PostConstruct
	@Bean
	public OrikaScanBean orikaScanBean() {
		return new OrikaScanBean();
	}

	@Bean
	public Module jtsModule() {
		return new JtsModule();
+5 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import es.redmic.tasks.ingest.model.status.model.UserTasks;
import es.redmic.tasks.ingest.model.step.model.FailedStep;
import es.redmic.tasks.ingest.model.step.model.RegisteredStep;
import ma.glasnost.orika.CustomConverter;
import ma.glasnost.orika.MappingContext;
import ma.glasnost.orika.metadata.Type;

@Component
@@ -52,7 +53,8 @@ public class ExceptionToFailedTaskDTOConverter extends CustomConverter<IngestBas
	private MessageSource messageSource;

	@Override
	public FailedTaskDTO convert(IngestBaseException source, Type<? extends FailedTaskDTO> destinationType) {
	public FailedTaskDTO convert(IngestBaseException source, Type<? extends FailedTaskDTO> destinationType,
		MappingContext mappingContext) {

		UserTasks task = (UserTasks) repository.findById(source.getTaskId()).get_source();
		task.setStatus(TaskStatus.FAILED);
+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public abstract class TaskBaseRepository {

	public FailedTaskDTO setFailed(IngestBaseException ex) {

		FailedTaskDTO failedTask = orikaMapper.getMapperFacade().convert(ex, FailedTaskDTO.class, null);
		FailedTaskDTO failedTask = orikaMapper.getMapperFacade().convert(ex, FailedTaskDTO.class, null, null);

		LOGGER.debug("Registrando error en la tarea " + failedTask.getTaskName() + " para el usuario "
				+ failedTask.getUserId());
+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import es.redmic.tasks.ingest.model.status.model.UserTasks;
public class UserTasksRepository extends RWDataESRepository<UserTasks> {

	private static String[] INDEX = { "user" };
	private static String[] TYPE = { "tasks" };
	private static String TYPE = "tasks";

	public UserTasksRepository() {
		super(INDEX, TYPE);
+4 −4
Original line number Diff line number Diff line
package es.redmic.tasks.common.service;

import org.locationtech.jts.geom.Geometry;

/*-
 * #%L
 * Tasks
@@ -22,8 +24,6 @@ package es.redmic.tasks.common.service;

import org.springframework.stereotype.Service;

import com.vividsolutions.jts.geom.Geometry;

import es.redmic.es.geodata.common.service.GridServiceItfc;
import es.redmic.es.tools.distributions.species.repository.RWTaxonDistributionRepository;
import es.redmic.exception.common.ExceptionType;
Loading