Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 77: iso8601 timezones aren't supported in DateService. changed to use regular DateTime constructor 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@1639 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2009-07-17 15:55:22 +00:00
parent cf8fa7aa33
commit 73ec708b03
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/jclouds/http/functions/config/ParserModule.java
View File

@ -71,7 +71,10 @@ public class ParserModule extends AbstractModule {
public DateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) public DateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
throws JsonParseException { throws JsonParseException {
String toParse = json.getAsJsonPrimitive().getAsString(); String toParse = json.getAsJsonPrimitive().getAsString();
return dateService.iso8601DateParse(toParse); DateTime toReturn = dateService.iso8601DateParse(toParse);
if (toReturn == null) toReturn = new DateTime(toParse);
if (toReturn == null) throw new RuntimeException("could not parse: "+toParse);
return toReturn;
} }
} }

4
rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersConnectionLiveTest.java
View File

@ -121,9 +121,9 @@ public class CloudServersConnectionLiveTest {
for (Image image : response) { for (Image image : response) {
assertTrue(image.getId() >= 1); assertTrue(image.getId() >= 1);
assert null != image.getName() : image; assert null != image.getName() : image;
// TODO: Web Hosting #118779 // sometimes this is not present per: Web Hosting #118820
// assert null != image.getCreated() : image; // assert null != image.getCreated() : image;
// assert null != image.getUpdated() : image; assert null != image.getUpdated() : image;
assert null != image.getStatus() : image; assert null != image.getStatus() : image;
} }
} }

14
rackspace/cloudservers/core/src/test/java/org/jclouds/rackspace/cloudservers/functions/ParseImageListFromGsonResponseTest.java
View File

@ -33,6 +33,7 @@ import org.jclouds.http.functions.config.ParserModule;
import org.jclouds.rackspace.cloudservers.domain.Image; import org.jclouds.rackspace.cloudservers.domain.Image;
import org.jclouds.rackspace.cloudservers.domain.ImageStatus; import org.jclouds.rackspace.cloudservers.domain.ImageStatus;
import org.jclouds.util.DateService; import org.jclouds.util.DateService;
import org.joda.time.DateTime;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@ -69,23 +70,20 @@ public class ParseImageListFromGsonResponseTest {
List<Image> response = parser.apply(is); List<Image> response = parser.apply(is);
assertEquals(response.get(0).getId(), 2); assertEquals(response.get(0).getId(), 2);
assertEquals(response.get(0).getName(), "CentOS 5.2"); assertEquals(response.get(0).getName(), "CentOS 5.2");
// Web Hosting #118779 assertEquals(response.get(0).getCreated(), new DateTime("2010-08-10T12:00:00Z"));
assertEquals(null, response.get(0).getCreated());
assertEquals(response.get(0).getProgress(), null); assertEquals(response.get(0).getProgress(), null);
assertEquals(response.get(0).getServerId(), null); assertEquals(response.get(0).getServerId(), null);
assertEquals(response.get(0).getStatus(), ImageStatus.ACTIVE); assertEquals(response.get(0).getStatus(), ImageStatus.ACTIVE);
assertEquals(response.get(0).getUpdated(), dateService assertEquals(response.get(0).getUpdated(), new DateTime("2010-10-10T12:00:00Z"));
.iso8601DateParse("2010-10-10T12:00:00Z"));
assertEquals(response.get(1).getId(), 743); assertEquals(response.get(1).getId(), 743);
assertEquals(response.get(1).getName(), "My Server Backup"); assertEquals(response.get(1).getName(), "My Server Backup");
assertEquals(response.get(1).getCreated(), dateService assertEquals(response.get(1).getCreated(), new DateTime("2009-07-07T09:56:16-05:00"));
.iso8601DateParse("2010-08-10T12:00:00Z")); ;
assertEquals(response.get(1).getProgress(), new Integer(80)); assertEquals(response.get(1).getProgress(), new Integer(80));
assertEquals(response.get(1).getServerId(), new Integer(12)); assertEquals(response.get(1).getServerId(), new Integer(12));
assertEquals(response.get(1).getStatus(), ImageStatus.SAVING); assertEquals(response.get(1).getStatus(), ImageStatus.SAVING);
assertEquals(response.get(1).getUpdated(), dateService assertEquals(response.get(1).getUpdated(), new DateTime("2010-10-10T12:00:00Z"));
.iso8601DateParse("2010-10-10T12:00:00Z"));
} }
} }