Permalink
Browse files

Merge branch 'release/22.0.5-BETA'

  • Loading branch information...
2 parents ccf72d5 + 0466307 commit 53eb03d6ff2185344e4a8bb794ebd605eaec48dc @tkral tkral committed Aug 13, 2011
Showing with 2,192 additions and 323 deletions.
  1. +1 −1 build-tools/pom.xml
  2. +1 −1 codegen/pom.xml
  3. +135 −0 codegen/src/test/java/com/force/sdk/codegen/filter/FieldReferenceFilterTest.java
  4. +123 −0 codegen/src/test/java/com/force/sdk/codegen/filter/ObjectCombinationFilterTest.java
  5. +1 −1 connector/pom.xml
  6. +1 −1 javasdk-test/codegen-test/pom.xml
  7. +13 −13 javasdk-test/codegen-test/src/test/java/com/force/sdk/codegen/CreatedClassCRUDFTest.java
  8. +6 −6 javasdk-test/codegen-test/src/test/java/com/force/sdk/codegen/entities/AccountCustomFields.java
  9. +177 −0 javasdk-test/codegen-test/src/test/java/com/force/sdk/codegen/filter/FilterCompileTest.java
  10. +1 −1 javasdk-test/connector-test/pom.xml
  11. +1 −1 javasdk-test/jpa-test-beanvalidation/pom.xml
  12. +1 −1 javasdk-test/jpa-test-connection/pom.xml
  13. +1 −1 javasdk-test/jpa-test-query/pom.xml
  14. +115 −0 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/QueryOrderByFTest.java
  15. +1 −10 ...jpa-test-query/src/test/java/com/force/sdk/jpa/query}/entities/orderby/ChildEntityOrderByInt.java
  16. +4 −14 ...st-query/src/test/java/com/force/sdk/jpa/query}/entities/orderby/ChildEntityOrderByIntString.java
  17. +1 −9 .../jpa-test-query/src/test/java/com/force/sdk/jpa/query}/entities/orderby/ChildEntityOrderByPk.java
  18. +2 −9 ...pa-test-query/src/test/java/com/force/sdk/jpa/query}/entities/orderby/ParentEntityOrderByInt.java
  19. +2 −9 ...t-query/src/test/java/com/force/sdk/jpa/query}/entities/orderby/ParentEntityOrderByIntString.java
  20. +2 −9 ...jpa-test-query/src/test/java/com/force/sdk/jpa/query}/entities/orderby/ParentEntityOrderByPk.java
  21. +1 −1 javasdk-test/jpa-test-schema/pom.xml
  22. +7 −0 javasdk-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/SchemaBaseTest.java
  23. +40 −9 javasdk-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/SchemaTest.java
  24. +3 −10 ...dk-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/entities/MappedSubclassEntity.java
  25. +45 −0 ...test-schema/src/test/java/com/force/sdk/jpa/schema/entities/MappedSubclassWithOverrideEntity.java
  26. +4 −2 ...-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/entities/MappedSuperclassEntity.java
  27. +46 −0 javasdk-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/entities/Owner.java
  28. +39 −2 javasdk-test/jpa-test-schema/src/test/resources/META-INF/persistence.xml
  29. +1 −1 javasdk-test/jpa-test/pom.xml
  30. +2 −2 javasdk-test/mock-oauth-server/pom.xml
  31. +2 −2 javasdk-test/oauth-app/pom.xml
  32. +54 −0 javasdk-test/oauth-app/src/main/java/com/force/servlets/LogoutSuccess.java
  33. +10 −10 javasdk-test/oauth-app/src/main/java/com/force/servlets/ProjectList.java
  34. +82 −4 javasdk-test/oauth-app/src/main/webapp/WEB-INF/web.xml
  35. +48 −0 javasdk-test/oauth-app/src/main/webapp/index.jsp
  36. +3 −4 javasdk-test/oauth-app/src/main/webapp/{index.html → logout_success.jsp}
  37. +3 −0 javasdk-test/oauth-app/src/main/webapp/project_list.jsp
  38. +9 −2 javasdk-test/oauth-integration-test/pom.xml
  39. +149 −0 ...dk-test/oauth-integration-test/src/test/java/com/force/sdk/oauth/endtoend/LogoutEndToEndTest.java
  40. +45 −0 javasdk-test/oauth-integration-test/testng-endtoend.xml
  41. +1 −1 javasdk-test/oauth-integration-test/testng-mock.xml
  42. +1 −1 javasdk-test/oauth-test/pom.xml
  43. +35 −13 javasdk-test/oauth-test/src/test/java/com/force/sdk/oauth/BasicAuthFilterTest.java
  44. +163 −0 javasdk-test/oauth-test/src/test/java/com/force/sdk/oauth/BasicLogoutTest.java
  45. +1 −1 javasdk-test/pom.xml
  46. +1 −5 javasdk-test/qa-utils/pom.xml
  47. +4 −8 javasdk-test/qa-utils/src/main/java/com/force/sdk/qa/util/TestContext.java
  48. +4 −7 ...dk-test/qa-utils/src/main/java/com/force/sdk/qa/util/integration/BaseSecurityIntegrationTest.java
  49. +2 −2 javasdk-test/springsecurity-app/pom.xml
  50. +2 −2 javasdk-test/springsecurity-integration-test/pom.xml
  51. +1 −1 javasdk-test/springsecurity-integration-test/testng-endtoend.xml
  52. +1 −1 javasdk-test/springsecurity-integration-test/testng-mock.xml
  53. +1 −1 javasdk-test/springsecurity-test/pom.xml
  54. +12 −9 jpa/doc/database-com-datatypes.md
  55. +0 −4 jpa/doc/jpa-queries-soql.md
  56. +10 −17 jpa/doc/jpa-queries.md
  57. +1 −1 jpa/pom.xml
  58. +4 −4 jpa/src/main/java/com/force/sdk/jpa/ForceMetaDataManager.java
  59. +2 −2 jpa/src/main/java/com/force/sdk/jpa/ForceStoreManager.java
  60. +2 −2 jpa/src/main/java/com/force/sdk/jpa/PersistenceUtils.java
  61. +5 −5 jpa/src/main/java/com/force/sdk/jpa/model/BaseForceStandardObject.java
  62. +1 −1 jpa/src/main/java/com/force/sdk/jpa/model/{Owner.java → ForceOwner.java}
  63. +1 −1 jpa/src/main/java/com/force/sdk/jpa/schema/ForceStoreSchemaHandler.java
  64. +32 −13 jpa/src/main/java/com/force/sdk/jpa/table/ForceColumnMetaData.java
  65. +1 −1 jpa/src/main/java/com/force/sdk/jpa/table/TableImpl.java
  66. +58 −0 jpa/src/test/java/com/force/sdk/jpa/entities/related/Entity0.java
  67. +62 −0 jpa/src/test/java/com/force/sdk/jpa/entities/related/Entity1.java
  68. +62 −0 jpa/src/test/java/com/force/sdk/jpa/entities/related/Entity2.java
  69. +62 −0 jpa/src/test/java/com/force/sdk/jpa/entities/related/Entity3.java
  70. +62 −0 jpa/src/test/java/com/force/sdk/jpa/entities/related/Entity4.java
  71. +62 −0 jpa/src/test/java/com/force/sdk/jpa/entities/related/Entity5.java
  72. +63 −0 jpa/src/test/java/com/force/sdk/jpa/entities/related/Entity6.java
  73. +3 −3 jpa/src/test/java/com/force/sdk/jpa/mock/MockForceStoreSchemaHandler.java
  74. +81 −0 jpa/src/test/java/com/force/sdk/jpa/query/FetchTypeTest.java
  75. +0 −71 jpa/src/test/java/com/force/sdk/jpa/query/QueryOrderByAnnotationTest.java
  76. +14 −0 jpa/src/test/resources/META-INF/persistence.xml
  77. +26 −2 oauth/doc/oauth-auth.md
  78. +1 −1 oauth/pom.xml
  79. +83 −1 oauth/src/main/java/com/force/sdk/oauth/AuthFilter.java
  80. +3 −0 oauth/src/main/java/com/force/sdk/oauth/connector/ForceOAuthConnector.java
  81. +32 −0 oauth/src/main/java/com/force/sdk/oauth/connector/TokenRetrievalServiceImpl.java
  82. +16 −0 oauth/src/main/java/com/force/sdk/oauth/context/store/SecurityContextCookieStore.java
  83. +20 −2 oauth/src/main/java/com/force/sdk/oauth/context/store/SecurityContextSessionStore.java
  84. +8 −0 oauth/src/main/java/com/force/sdk/oauth/context/store/SecurityContextStorageService.java
  85. +2 −2 pom.xml
  86. +1 −1 springsecurity/doc/spring-security.md
  87. +1 −1 springsecurity/pom.xml
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk</artifactId>
- <version>22.0.4-BETA</version>
+ <version>22.0.5-BETA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk</artifactId>
- <version>22.0.4-BETA</version>
+ <version>22.0.5-BETA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -0,0 +1,135 @@
+/**
+ * Copyright (c) 2011, salesforce.com, inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the
+ * following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.force.sdk.codegen.filter;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import com.sforce.soap.partner.DescribeSObjectResult;
+import com.sforce.soap.partner.Field;
+import com.sforce.soap.partner.FieldType;
+
+/**
+ *
+ * Unit tests for {@link FieldReferenceFilter}.
+ *
+ * @author Jeff Lai
+ *
+ */
+public class FieldReferenceFilterTest {
+
+ DescribeSObjectResult dsr;
+
+ @BeforeClass
+ public void setupClass() {
+ dsr = new DescribeSObjectResult();
+ dsr.setName("Object_Name__c");
+
+ Field idField = new Field();
+ idField.setName("Id");
+ idField.setType(FieldType.id);
+
+ Field nameField = new Field();
+ nameField.setName("Name");
+ nameField.setType(FieldType.string);
+
+ Field phoneField = new Field();
+ phoneField.setName("Phone");
+ phoneField.setType(FieldType.reference);
+ phoneField.setReferenceTo(new String[] {"Phone"});
+
+ Field acceptedField = new Field();
+ acceptedField.setName("Accepted");
+ acceptedField.setType(FieldType.reference);
+ acceptedField.setReferenceTo(new String[] {"Accepted"});
+
+ dsr.setFields(new Field[] {idField, nameField, phoneField, acceptedField});
+
+ }
+
+ @Test
+ public void testExcludeOneField() {
+ List<Field> fields = new FieldReferenceFilter(false, Collections.singleton("Phone")).filter(dsr);
+ verifyFilteredFields(fields, Arrays.asList(new String[] {"Accepted", "Id", "Name"}));
+ }
+
+ @Test
+ public void testIncludeOneField() {
+ List<Field> fields = new FieldReferenceFilter(true, Collections.singleton("Phone")).filter(dsr);
+ verifyFilteredFields(fields, Arrays.asList(new String[] {"Id", "Name", "Phone"}));
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testExcludeZeroFields() {
+ List<Field> fields = new FieldReferenceFilter(false, Collections.EMPTY_SET).filter(dsr);
+ verifyFilteredFields(fields, Arrays.asList(new String[] {"Accepted", "Id", "Name", "Phone"}));
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testIncludeZeroFields() {
+ List<Field> fields = new FieldReferenceFilter(true, Collections.EMPTY_SET).filter(dsr);
+ verifyFilteredFields(fields, Arrays.asList(new String[] {"Id", "Name"}));
+ }
+
+ private void verifyFilteredFields(List<Field> actualFields, List<String> expectedFieldNames) {
+ Collections.sort(actualFields, new FieldComparator());
+ Collections.sort(expectedFieldNames);
+ Assert.assertEquals(actualFields.size(), expectedFieldNames.size(),
+ "unexpected number of returned fields after filtering");
+ for (int i = 0; i < actualFields.size(); i++) {
+ Assert.assertEquals(actualFields.get(i).getName(), expectedFieldNames.get(i), "unexpected field name");
+ }
+ }
+
+ /**
+ *
+ * Comparator class for sorting SObjectResult Fields.
+ *
+ * @author Jeff Lai
+ *
+ */
+ private static class FieldComparator implements Comparator<Field>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public int compare(Field field1, Field field2) {
+ return field1.getName().compareTo(field2.getName());
+ }
+
+ }
+
+}
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) 2011, salesforce.com, inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the
+ * following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+ * the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.force.sdk.codegen.filter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import com.sforce.soap.partner.DescribeSObjectResult;
+import com.sforce.soap.partner.Field;
+import com.sforce.soap.partner.FieldType;
+
+/**
+ *
+ * Unit tests for {@link ObjectCombinationFilter}.
+ *
+ * @author Jeff Lai
+ *
+ */
+public class ObjectCombinationFilterTest {
+
+ List<DescribeSObjectResult> dsrs;
+
+ @BeforeClass
+ public void classSetup() {
+ dsrs = new ArrayList<DescribeSObjectResult>();
+ for (int i = 0; i < 4; i++) {
+ dsrs.add(new DescribeSObjectResult());
+ dsrs.get(i).setName("Object" + i + "__c");
+ }
+ Field refField = new Field();
+ refField.setName("ref__c");
+ refField.setType(FieldType.reference);
+ refField.setReferenceTo(new String[] {"Object3__c"});
+ dsrs.get(1).setFields(new Field[] {refField});
+ }
+
+ @Test
+ public void testOneNameFilter() {
+ ObjectNameFilter nameFilter = new ObjectNameFilter(false, "Object0__c");
+ List<DescribeSObjectResult> sObjects = new ObjectCombinationFilter().addFilter(nameFilter).filter(dsrs);
+ verifyFilteredFields(sObjects, Arrays.asList(new String[] {"Object1__c", "Object2__c", "Object3__c"}));
+ }
+
+ @Test
+ public void testTwoNameFilters() {
+ ObjectNameFilter nameFilter0 = new ObjectNameFilter(false, "Object0__c");
+ ObjectNameFilter nameFilter1 = new ObjectNameFilter(false, "Object1__c");
+ List<DescribeSObjectResult> sObjects = new ObjectCombinationFilter().addFilter(nameFilter0)
+ .addFilter(nameFilter1).filter(dsrs);
+ verifyFilteredFields(sObjects, Arrays.asList(new String[] {"Object2__c", "Object3__c"}));
+ }
+
+ @Test
+ public void testNameAndNameFieldRefFilters() {
+ ObjectNameFilter nameFilter = new ObjectNameFilter(false, "Object0__c");
+ ObjectNameWithRefFilter nameWithRefFilter = new ObjectNameWithRefFilter("Object1__c");
+ List<DescribeSObjectResult> sObjects = new ObjectCombinationFilter().addFilter(nameFilter)
+ .addFilter(nameWithRefFilter).filter(dsrs);
+ verifyFilteredFields(sObjects, Arrays.asList(new String[] {"Object1__c", "Object3__c"}));
+ }
+
+ private void verifyFilteredFields(List<DescribeSObjectResult> actualSObjects, List<String> expectedSObjectNames) {
+ Collections.sort(actualSObjects, new DescribeSObjectComparator());
+ Collections.sort(expectedSObjectNames);
+ Assert.assertEquals(actualSObjects.size(), expectedSObjectNames.size(),
+ "unexpected number of returned sObjects after filtering");
+ for (int i = 0; i < actualSObjects.size(); i++) {
+ Assert.assertEquals(actualSObjects.get(i).getName(), expectedSObjectNames.get(i), "unexpected sObject name");
+ }
+ }
+
+ /**
+ *
+ * Comparator class for sorting SObjectResults.
+ *
+ * @author Jeff Lai
+ *
+ */
+ private static class DescribeSObjectComparator implements Comparator<DescribeSObjectResult>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public int compare(DescribeSObjectResult object1, DescribeSObjectResult object2) {
+ return object1.getName().compareTo(object2.getName());
+ }
+
+
+ }
+
+}
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk</artifactId>
- <version>22.0.4-BETA</version>
+ <version>22.0.5-BETA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -8,7 +8,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.4-BETA</version>
+ <version>22.0.5-BETA</version>
</parent>
<build>
@@ -46,7 +46,7 @@
import com.force.sdk.codegen.entities.AccountCustomFields;
import com.force.sdk.codegen.entities.NewCustomObject;
import com.force.sdk.jpa.model.BaseForceObject;
-import com.force.sdk.jpa.model.Owner;
+import com.force.sdk.jpa.model.ForceOwner;
import com.force.sdk.qa.util.TestContext;
import com.force.sdk.qa.util.jpa.BaseMultiEntityManagerJPAFTest;
@@ -140,20 +140,20 @@ public void testEagerlyFetchedOwnerField() {
tx.begin();
entity = em.find(entity.getClass(), entity.getId());
- assertNotNull(entity.getOwner(), "Owner field was not found");
- assertNotNull(entity.getOwner().getId(), "Owner id was not found");
- assertNotNull(entity.getOwner().getName(), "Owner name was not found");
+ assertNotNull(entity.getForceOwner(), "Force.com Owner field was not found");
+ assertNotNull(entity.getForceOwner().getId(), "Force.com Owner id was not found");
+ assertNotNull(entity.getForceOwner().getName(), "Force.com Owner name was not found");
- // Assert that the Owner is in the cache
+ // Assert that the Force.com Owner is in the cache
ObjectManager om = (ObjectManager) em.getDelegate();
- assertNotNull(om.getObjectFromCache(new StringIdentity(Owner.class, entity.getOwner().getId())));
+ assertNotNull(om.getObjectFromCache(new StringIdentity(ForceOwner.class, entity.getForceOwner().getId())));
tx.commit();
- // Owner is eagerly fetched on AccountCustomFields so
+ // Force.com Owner is eagerly fetched on AccountCustomFields so
// it should be available outside of the find transaction
- assertNotNull(entity.getOwner(), "Owner field did not get eagerly fetched");
- assertNotNull(entity.getOwner().getId(), "Owner id did not get eagerly fetched");
- assertNotNull(entity.getOwner().getName(), "Owner name did not get eagerly fetched");
+ assertNotNull(entity.getForceOwner(), "Force.com Owner field did not get eagerly fetched");
+ assertNotNull(entity.getForceOwner().getId(), "Force.com Owner id did not get eagerly fetched");
+ assertNotNull(entity.getForceOwner().getName(), "Force.com Owner name did not get eagerly fetched");
}
@Test
@@ -233,11 +233,11 @@ public void testLazilyFetchedOwnerField() {
entity = em.find(entity.getClass(), entity.getId());
tx.commit();
- // Owner is lazily fetched on NewCustomObject so
+ // Force.com Owner is lazily fetched on NewCustomObject so
// it should not be available outside of the find transaction
try {
- entity.getOwner();
- fail("Owner field should not be available outside of the find transaction because it is lazily fetched.");
+ entity.getForceOwner();
+ fail("Force.com Owner field should not be available outside of the find transaction because it is lazily fetched.");
} catch (JDODetachedFieldAccessException expected) {
// Expected
}
@@ -28,7 +28,7 @@
import javax.persistence.*;
-import com.force.sdk.jpa.model.Owner;
+import com.force.sdk.jpa.model.ForceOwner;
/**
* Extension of the Account standard object.
@@ -48,18 +48,18 @@ public void setSomeCustomField(String someCustomField) {
this.someCustomField = someCustomField;
}
- // Override Owner fetch type to EAGER
+ // Override Force.com Owner fetch type to EAGER
// This will load the entire owner object
@Override
@ManyToOne
@Basic(fetch = FetchType.EAGER)
@Column(name = "ownerId")
- public Owner getOwner() {
- return this.owner;
+ public ForceOwner getForceOwner() {
+ return this.forceOwner;
}
@Override
- public void setOwner(Owner owner) {
- this.owner = owner;
+ public void setForceOwner(ForceOwner owner) {
+ this.forceOwner = owner;
}
}
Oops, something went wrong.

0 comments on commit 53eb03d

Please sign in to comment.