Commit 6d8c7d90 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/models!3
parents 550b4480 f0b545fa

.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:

src/main/java/es/redmic/models/es/administrative/taxonomy/dto/WormsDTO.java

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; 
import com.fasterxml.jackson.databind.annotation.JsonSerialize;



import es.redmic.models.es.common.constraintvalidate.url.ValidateUrl;

import es.redmic.models.es.common.deserializer.CustomDateTimeWOMillisecondsDeserializer;

import es.redmic.models.es.common.deserializer.CustomDateTimeDeserializer;

import es.redmic.models.es.common.serializer.CustomDateTimeSerializer;



public class WormsDTO extends WormsBaseDTO {
@@ -33,7 +33,7 @@ public class WormsDTO extends WormsBaseDTO { 


	@NotNull

	@JsonSerialize(using = CustomDateTimeSerializer.class)

	@JsonDeserialize(using = CustomDateTimeWOMillisecondsDeserializer.class)

	@JsonDeserialize(using = CustomDateTimeDeserializer.class)

	private DateTime modified;



	public String getStatus() {

src/test/java/es/redmic/test/unit/administrative/taxonomy/dto/WormsDTOTest.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class WormsDTOTest extends DTOBaseTest<WormsDTO> { 
		assertEquals(result.getAphia().intValue(), 136470);

		assertEquals(result.getScientificname(), "Leptochelia dubia");

		assertEquals(result.getAuthority(), "(Kr\u00f8yer, 1842)");

		assertEquals(result.getModified().toString(), "2016-06-29T21:59:13.000Z");

		assertEquals(result.getModified().toString(), "2016-06-29T21:59:13.730Z");

		assertEquals(result.getRank(), "Species");

		assertEquals(result.getStatus(), "unaccepted");

		assertEquals(result.getUrl(), "http://www.marinespecies.org/aphia.php?p=taxdetails&id=136470");

src/test/resources/worms/aphiaRecord.json

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ 
	"isTerrestrial": null,

	"isExtinct": null,

	"match_type": "exact",

	"modified": "2016-06-29T21:59:13Z"

	"modified": "2016-06-29T21:59:13.730Z"

}
 
 No newline at end of file

src/test/resources/worms/aphiaRecordList.json

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
	"isTerrestrial": null,

	"isExtinct": null,

	"match_type": "like",

	"modified": "2014-10-22T15:12:35Z"

	"modified": "2014-10-22T15:12:35.730Z"

}, {

	"AphiaID": 829015,

	"url": "http:\/\/www.marinespecies.org\/aphia.php?p=taxdetails&id=829015",
@@ -49,7 +49,7 @@ 
	"isTerrestrial": null,

	"isExtinct": null,

	"match_type": "like",

	"modified": "2015-01-09T14:40:28Z"

	"modified": "2015-01-09T14:40:28.730Z"

}, {

	"AphiaID": 136470,

	"url": "http:\/\/www.marinespecies.org\/aphia.php?p=taxdetails&id=136470",
@@ -75,5 +75,5 @@ 
	"isTerrestrial": null,

	"isExtinct": null,

	"match_type": "like",

	"modified": "2016-06-29T21:59:13Z"

	"modified": "2016-06-29T21:59:13.730Z"

}]
 
 No newline at end of file