You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/03/07 22:05:06 UTC
[06/50] [abbrv] airavata git commit: AIRAVATA-2316 Eager fetch all
UserProfile associations
AIRAVATA-2316 Eager fetch all UserProfile associations
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0bc5f2e9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0bc5f2e9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0bc5f2e9
Branch: refs/heads/develop
Commit: 0bc5f2e9b4d63fb02f5519d26a8cd84443ef70d3
Parents: 589392e
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Feb 22 17:03:34 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Feb 22 17:03:34 2017 -0500
----------------------------------------------------------------------
.../user/registry/core/entities/UserProfileEntity.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0bc5f2e9/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
----------------------------------------------------------------------
diff --git a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
index 1285efd..81bf18e 100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
@@ -114,7 +114,7 @@ public class UserProfileEntity {
this.orcidId = orcidId;
}
- @ElementCollection
+ @ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name="USER_PROFILE_PHONE", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
public List<String> getPhones() {
return phones;
@@ -133,7 +133,7 @@ public class UserProfileEntity {
this.country = country;
}
- @ElementCollection
+ @ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name="USER_PROFILE_NATIONALITY", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
public List<String> getNationality() {
return nationality;
@@ -207,7 +207,7 @@ public class UserProfileEntity {
this.comments = comments;
}
- @ElementCollection
+ @ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name="USER_PROFILE_LABELED_URI", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
public List<String> getLabeledURI() {
return labeledURI;
@@ -236,7 +236,7 @@ public class UserProfileEntity {
this.timeZone = timeZone;
}
- @OneToOne(targetEntity = NSFDemographicsEntity.class, cascade = CascadeType.ALL, mappedBy = "userProfile")
+ @OneToOne(targetEntity = NSFDemographicsEntity.class, cascade = CascadeType.ALL, mappedBy = "userProfile", fetch = FetchType.EAGER)
public NSFDemographicsEntity getNsfDemographics() {
return nsfDemographics;
}