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

Merge pull request #1394 from jclouds/ultra-check-ids 

check ids returned from resources are not null
This commit is contained in:
Adrian Cole 2013-03-08 13:10:05 -08:00
parent f994fdfc17 a3250011aa
commit d5177507a3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
labs/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/xml/GuidHandler.java
View File

@ -18,6 +18,7 @@
*/
package org.jclouds.ultradns.ws.xml;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.util.SaxUtils.currentOrNull;
import static org.jclouds.util.SaxUtils.equalsOrSuffix;
@ -35,7 +36,7 @@ public class GuidHandler extends ParseSax.HandlerForGeneratedRequestWithResult<S
@Override
public String getResult() {
try {
return guid;
return checkNotNull(guid, "guid not present in the response");
} finally {
guid = null;
}

3
labs/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/xml/RRPoolIDHandler.java
View File

@ -18,6 +18,7 @@
*/
package org.jclouds.ultradns.ws.xml;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.util.SaxUtils.currentOrNull;
import static org.jclouds.util.SaxUtils.equalsOrSuffix;
@ -35,7 +36,7 @@ public class RRPoolIDHandler extends ParseSax.HandlerForGeneratedRequestWithResu
@Override
public String getResult() {
try {
return rrPoolID;
return checkNotNull(rrPoolID, "RRPoolId not present in the response");
} finally {
rrPoolID = null;
}

2
labs/ultradns-ws/src/test/resources/rr_created.xml
View File

@ -1 +1 @@
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:v01="http://webservice.api.ultra.neustar.com/v01/"><soapenv:Header><wsse:Security soapenv:mustUnderstand="1" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:UsernameToken><wsse:Username>identity</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">credential</wsse:Password></wsse:UsernameToken></wsse:Security></soapenv:Header><soapenv:Body><v01:createResourceRecord><transactionID /><resourceRecord ZoneName="jclouds.org." Type="15" DName="mail.jclouds.org." TTL="1800"><InfoValues Info1Value="10" Info2Value="maileast.jclouds.org." /></resourceRecord></v01:createResourceRecord></soapenv:Body></soapenv:Envelope>
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><ns1:createResourceRecordResponse xmlns:ns1="http://webservice.api.ultra.neustar.com/v01/"><guid xmlns:ns2="http://schema.ultraservice.neustar.com/v01/">04063D9D54C6A01F</guid></ns1:createResourceRecordResponse></soap:Body></soap:Envelope>