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

Merge branch 'dev' into 'master' 

Actualiza imagen de compilación

See merge request redmic-project/server/library/elasticsearch!1
parents f8274426 a9865ae7

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ stages: 


maven-build:

  stage: build

  image: redmic/maven-gitlab

  image: registry.gitlab.com/redmic-project/docker/maven

  variables:

    MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"

  only:

pom.xml

+94 −13
Original line number Diff line number Diff line 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

<project xmlns="http://maven.apache.org/POM/4.0.0"

	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">



	<parent>

		<groupId>es.redmic.lib</groupId>

		<artifactId>libs</artifactId>

		<version>0.6.0</version>

		<groupId>org.springframework.boot</groupId>

		<artifactId>spring-boot-starter-parent</artifactId>

		<version>2.0.0.RELEASE</version>

		<relativePath />

	</parent>



	<modelVersion>4.0.0</modelVersion>

	<groupId>es.redmic.lib</groupId>

	<artifactId>elasticsearch</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<name>ElasticSearch</name>

	<description>ElasticSearch library </description>



	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<maven.compiler.source>1.8</maven.compiler.source>

		<maven.compiler.target>1.8</maven.compiler.target>

		<java.version>1.8</java.version>



		<!-- REDMIC -->

		<redmic.models.version>0.6.0</redmic.models.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.utils.version>0.6.0</redmic.utils.version>



		<!-- OTHERS -->

		<elasticsearch.x-pack.version>5.6.1</elasticsearch.x-pack.version>

		<spatial4j.version>0.6</spatial4j.version>

		<ma.glasnost.orika.core.version>1.4.6</ma.glasnost.orika.core.version>

		<commons-io.version>2.6</commons-io.version>



		<jsonassert.version>1.5.0</jsonassert.version>

		<powermock.version>1.7.3</powermock.version>



		<!-- Version plugins -->

		<jacoco.version>0.8.1</jacoco.version>



		<!-- Environment variables -->

		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>

	</properties>



	<dependencies>
@@ -18,21 +51,21 @@ 
		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>models</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.models.version}</version>

			<scope>provided</scope>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>exceptions</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.exceptions.version}</version>

			<scope>provided</scope>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>utils</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.utils.version}</version>

			<scope>provided</scope>

		</dependency>
@@ -47,21 +80,21 @@ 


		<dependency>

			<groupId>org.elasticsearch.client</groupId>

			<artifactId>transport</artifactId>

			<version>${elasticsearch.version}</version>

			<artifactId>x-pack-transport</artifactId>

			<version>${elasticsearch.x-pack.version}</version>

		</dependency>



		<!-- https://mvnrepository.com/artifact/org.locationtech.spatial4j/spatial4j -->

		<dependency>

			<groupId>org.locationtech.spatial4j</groupId>

			<artifactId>spatial4j</artifactId>

			<version>0.6</version>

			<version>${spatial4j.version}</version>

		</dependency>

		<!-- De momento usa versión vieja por problemas con mapper de geo -->

		<dependency>

			<groupId>ma.glasnost.orika</groupId>

			<artifactId>orika-core</artifactId>

			<version>1.4.6</version>

			<version>${ma.glasnost.orika.core.version}</version>

			<scope>provided</scope>

		</dependency>
@@ -71,6 +104,18 @@ 
			<version>${commons-io.version}</version>

		</dependency>

		

		<!-- Logs -->

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-api</artifactId>

			<scope>provided</scope>

		</dependency>

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-core</artifactId>

			<scope>provided</scope>

		</dependency>



		<!-- tests -->

		<dependency>

			<groupId>org.skyscreamer</groupId>
@@ -99,5 +144,41 @@ 
			<scope>test</scope>

		</dependency>

	</dependencies>



	<distributionManagement>

		<repository>

			<id>central</id>

			<name>redmic-releases</name>

			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>

		</repository>

		<snapshotRepository>

			<id>snapshots</id>

			<name>redmic-snapshots</name>

			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>

			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<build>

		<plugins>

			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>${jacoco.version}</version>

				<executions>

					<execution>

						<id>pre-unit-test</id>

						<goals>

							<goal>prepare-agent</goal>

						</goals>

					</execution>

					<execution>

						<id>post-unit-test</id>

						<phase>test</phase>

						<goals>

							<goal>report</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

		</plugins>

	</build>

</project>

src/main/java/es/redmic/es/administrative/repository/ActivityCommonESRepository.java

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ public abstract class ActivityCommonESRepository<TModel extends ActivityBase> ex 


	@Override

	protected String[] getDefaultSearchFields() {

		return new String[] { "name", "name.suggest", "code" };

		return new String[] { "name", "name.suggest", "code", "code.suggest" };

	}



	@Override

	protected String[] getDefaultHighlightFields() {

		return new String[] { "name", "name.suggest", "code" };

		return new String[] { "name", "name.suggest", "code", "code.suggest" };

	}



	@Override

src/main/java/es/redmic/es/administrative/taxonomy/mapper/WormsESMapper.java

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ public class WormsESMapper extends CustomMapper<WormsDTO, TaxonDTO> { 
		b.setAuthorship(a.getAuthority());

		b.setScientificName(a.getScientificname());

		b.setWorms(a.getUrl());

		b.setStatus(mapperFacade.map(statusESService.findByName(a.getStatus()), StatusDTO.class));

		b.setRank(mapperFacade.map(rankESService.findByName(a.getRank()), RankDTO.class));

		b.setStatus(mapperFacade.map(statusESService.findByName_en(a.getStatus()), StatusDTO.class));

		b.setRank(mapperFacade.map(rankESService.findByName_en(a.getRank()), RankDTO.class));



		b.setWormsUpdated(a.getModified());

	}

src/main/java/es/redmic/es/administrative/taxonomy/service/WormsToRedmicService.java

+18 −1
Original line number Diff line number Diff line 
package es.redmic.es.administrative.taxonomy.service;



import java.util.ArrayList;

import java.util.List;



import javax.annotation.PostConstruct;
@@ -53,6 +54,8 @@ public class WormsToRedmicService { 


	private List<RankDTO> ranks;



	private List<String> speciesRankLabel = new ArrayList<>();



	private final Logger LOGGER = LoggerFactory.getLogger(WormsToRedmicService.class);



	public WormsToRedmicService() {
@@ -62,6 +65,12 @@ public class WormsToRedmicService { 
	@PostConstruct

	private void init() {

		ranks = rankESService.getRankClassification();



		for (RankDTO rank : ranks) {

			if (rank.getId() >= 10) {

				speciesRankLabel.add(rank.getName_en());

			}

		}

	}



	/*
@@ -370,7 +379,15 @@ public class WormsToRedmicService { 


	public WormsListDTO findAphiaRecordsByScientificName(String scientificName) {



		WormsListDTO result = (WormsListDTO) client.get(APHIA_RECORDS_BY_NAME + scientificName, WormsListDTO.class);

		WormsListDTO wormsList = (WormsListDTO) client.get(APHIA_RECORDS_BY_NAME + scientificName, WormsListDTO.class),

				result = new WormsListDTO();



		for (WormsDTO dto : wormsList) {



			if (speciesRankLabel.contains(dto.getRank())) {

				result.add(dto);

			}

		}



		return result != null ? result : new WormsListDTO();

	}