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

Merge branch 'dev' into 'master' 

Modifica test evitando fallos por cambio horario

See merge request redmic-project/server/library/models!4
parents 6d8c7d90 22889edf

src/main/java/es/redmic/models/es/common/deserializer/CustomDateTimeDeserializer.java

+3 −5
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ import java.io.IOException; 


import org.joda.time.DateTime;

import org.joda.time.DateTimeZone;

import org.joda.time.format.DateTimeFormat;

import org.joda.time.format.DateTimeFormatter;



import com.fasterxml.jackson.core.JsonParser;

import com.fasterxml.jackson.databind.DeserializationContext;
@@ -15,12 +13,11 @@ import es.redmic.exception.databinding.DateTimeDeserializerException; 


public class CustomDateTimeDeserializer extends JsonDeserializer<DateTime> {



	final String pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZZ";

	final String pattern = "ISO8601";



	@Override

	public DateTime deserialize(JsonParser jp, DeserializationContext ctxt) {



		DateTimeFormatter patternFormat = DateTimeFormat.forPattern(pattern);

		String dateTime;



		try {
@@ -30,7 +27,8 @@ public class CustomDateTimeDeserializer extends JsonDeserializer<DateTime> { 
		}



		try {

			return patternFormat.parseDateTime(dateTime).toDateTime(DateTimeZone.UTC);



			return DateTime.parse(dateTime).toDateTime(DateTimeZone.UTC);

		} catch (Exception e) {



			throw new DateTimeDeserializerException(pattern, dateTime, e);

src/main/java/es/redmic/models/es/common/deserializer/CustomDateTimeWOMillisecondsDeserializer.java

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
package es.redmic.models.es.common.deserializer;



import java.io.IOException;



import org.joda.time.DateTime;

import org.joda.time.DateTimeZone;

import org.joda.time.format.DateTimeFormat;

import org.joda.time.format.DateTimeFormatter;



import com.fasterxml.jackson.core.JsonParser;

import com.fasterxml.jackson.databind.DeserializationContext;

import com.fasterxml.jackson.databind.JsonDeserializer;



import es.redmic.exception.databinding.DateTimeDeserializerException;



public class CustomDateTimeWOMillisecondsDeserializer extends JsonDeserializer<DateTime> {



	final String pattern = "yyyy-MM-dd'T'HH:mm:ssZZ";



	@Override

	public DateTime deserialize(JsonParser jp, DeserializationContext ctxt) {



		DateTimeFormatter patternFormat = DateTimeFormat.forPattern(pattern);

		String dateTime;



		try {

			dateTime = jp.getText();

		} catch (IOException e) {

			throw new DateTimeDeserializerException(pattern, null, e);

		}



		try {

			return patternFormat.parseDateTime(dateTime).toDateTime(DateTimeZone.UTC);

		} catch (Exception e) {



			throw new DateTimeDeserializerException(pattern, dateTime, e);

		}



	}

}
 
 No newline at end of file

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

+4 −0
Original line number Diff line number Diff line 
package es.redmic.test.unit.administrative.taxonomy.dto;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;



import java.io.IOException;

import java.util.List;
@@ -136,7 +137,10 @@ public class WormsDTOTest extends DTOBaseTest<WormsDTO> { 


		assertEquals(result.size(), 3);

		assertEquals(result.get(0).getAphia().intValue(), 819866);

		assertNotNull(result.get(0).getModified());

		assertEquals(result.get(1).getAphia().intValue(), 829015);

		assertNotNull(result.get(1).getModified());

		assertEquals(result.get(2).getAphia().intValue(), 136470);

		assertNotNull(result.get(2).getModified());

	}

}
 
 No newline at end of file

src/test/resources/worms/aphiaRecordList.json

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
	"isTerrestrial": null,

	"isExtinct": null,

	"match_type": "like",

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

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

}, {

	"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:13.730Z"

	"modified": "2016-06-29"

}]
 
 No newline at end of file