[teiid-commits] teiid SVN: r2790 - branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce.

Author: shawkins Date: 2010-12-22 09:39:41 -0500 (Wed, 22 Dec 2010) New Revision: 2790 Modified: branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java Log: TEIID-1402 TEIID-1408 ensuring that the queryresult is marked as done for retrieve and that exceptions are simply bubbled up. Modified: branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java =================================================================== --- branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java 2010-12-21 15:36:39 UTC (rev 2789) +++ branches/7.1.x/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java 2010-12-22 14:39:41 UTC (rev 2790) @@ -80,7 +80,7 @@ try { return sfSoap.getUserInfo(sh).getUserName(); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage()); + throw new ResourceException(e); } } @@ -108,11 +108,11 @@ ((BindingProvider)sfSoap).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url.toExternalForm()); loginResult = sfSoap.login(username, password); } catch (LoginFault e) { - throw new ResourceException(e.getCause().getMessage()); + throw new ResourceException(e); } catch (InvalidIdFault e) { - throw new ResourceException(e.getCause().getMessage()); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getCause().getMessage()); + throw new ResourceException(e); } LogManager.logTrace(LogConstants.CTX_CONNECTOR, "Login was successful for username " + username); //$NON-NLS-1$ @@ -130,7 +130,7 @@ try { sfSoap.getUserInfo(sh); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage()); + throw new ResourceException(e); } } } @@ -171,17 +171,17 @@ qr = sfSoap.query(queryString, sh); } } catch (InvalidFieldFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (MalformedQueryFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (InvalidIdFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidQueryLocatorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } return qr; } @@ -192,11 +192,11 @@ try { return sfSoap.queryMore(queryLocator, sh); } catch (InvalidFieldFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidQueryLocatorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } } @@ -206,7 +206,7 @@ try { results = sfSoap.delete(Arrays.asList(ids), sh); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } boolean allGood = true; @@ -244,13 +244,13 @@ try { result = sfSoap.create(objects, sh); } catch (InvalidFieldFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (InvalidIdFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } return analyzeResult(result); } @@ -269,13 +269,13 @@ try { result = sfSoap.update(params, sh); } catch (InvalidFieldFault e) { - throw new ResourceException(e.getMessage(),e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { - throw new ResourceException(e.getMessage(),e); + throw new ResourceException(e); } catch (InvalidIdFault e) { - throw new ResourceException(e.getMessage(),e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(),e); + throw new ResourceException(e); } return analyzeResult(result); } @@ -294,9 +294,9 @@ try { updated = sfSoap.getUpdated(objectType, startDate, endDate, sh); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } UpdatedResult result = new UpdatedResult(); result.setLatestDateCovered(updated.getLatestDateCovered().toGregorianCalendar()); @@ -310,9 +310,9 @@ try { deleted = sfSoap.getDeleted(objectName, startCalendar, endCalendar, sh); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } DeletedResult result = new DeletedResult(); result.setLatestDateCovered(deleted.getLatestDateCovered().toGregorianCalendar()); @@ -338,17 +338,18 @@ QueryResult result = new QueryResult(); result.getRecords().addAll(objects); result.setSize(objects.size()); + result.setDone(true); return result; } catch (InvalidFieldFault e) { - throw new ResourceException(e.getMessage(),e); + throw new ResourceException(e); } catch (MalformedQueryFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (InvalidIdFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(),e); + throw new ResourceException(e); } } @@ -357,9 +358,7 @@ try { return sfSoap.describeGlobal(sh); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - ResourceException ce = new ResourceException(e.getCause().getMessage()); - ce.initCause(e.getCause()); - throw ce; + throw new ResourceException(e); } } @@ -367,9 +366,9 @@ try { return sfSoap.describeSObject(objectName, sh); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { - throw new ResourceException(e.getMessage(), e); + throw new ResourceException(e); } }