[AIRAVATA-2712] Refactoring App Catalog Implementation - UserResourceProfile #185
Conversation
tilaks26
changed the title
tilaks26
changed the title
|
@smarru can you review this pull request? |
…into AIRAVATA-2712
| //default serial version id, required for serializable classes. | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Id |
There was a problem hiding this comment.
I don't think you need any JPA annotations on an id class. See Example 7-4.
There was a problem hiding this comment.
You're right, @machristie
@sachinkariyattin, I think we've been including JPA annotations for all Id classes.
| //default serial version id, required for serializable classes. | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Id |
| private boolean validated; | ||
|
|
||
| @ManyToOne(targetEntity = UserResourceProfileEntity.class, cascade = CascadeType.MERGE) | ||
| @JoinColumn(name = "USER_ID") |
There was a problem hiding this comment.
This should join on USER_ID and GATEWAY_ID
| private String loginUserName; | ||
|
|
||
| @ManyToOne(targetEntity = UserResourceProfileEntity.class, cascade = CascadeType.MERGE) | ||
| @JoinColumn(name = "USER_ID") |
There was a problem hiding this comment.
This should join on USER_ID and GATEWAY_ID
| //default serial version id, required for serializable classes. | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Id |
|
|
||
| @Override | ||
| public UserComputeResourcePreference getUserComputeResourcePreference(String userId, String gatewayId, String hostId) throws AppCatalogException { | ||
| UserComputeResourcePreferenceRepository userComputeResourcePreferenceRepository = new UserComputeResourcePreferenceRepository(); |
There was a problem hiding this comment.
Same comment here, should be able to do a userComputeResourcePreferenceRepository.get().
| queryParameters.put(DBConstants.UserStoragePreference.USER_ID, userId); | ||
| queryParameters.put(DBConstants.UserStoragePreference.GATEWAY_ID, gatewayId); | ||
| queryParameters.put(DBConstants.UserStoragePreference.STORAGE_RESOURCE_ID, storageId); | ||
| List<UserStoragePreference> userStoragePreferenceList = |
There was a problem hiding this comment.
Same, should do a userStoragePreferenceRepository.get().
| } | ||
|
|
||
| @Override | ||
| public String getUserNamefromID(String userId, String gatewayID) throws AppCatalogException { |
There was a problem hiding this comment.
Hmm, what is this used for, this seems weird?
There was a problem hiding this comment.
I don't really know. This method is a part of the UsrResourceProfile interface. So, I had to override it. But it doesn't make sense.
There was a problem hiding this comment.
Okay, that's fine, let's keep it for now since it is part of the interface.
| @@ -37,4 +37,26 @@ | |||
| "WHERE BQ.groupResourceProfileId LIKE : " + DBConstants.GroupResourceProfile.GROUP_RESOURCE_PROFILE_ID; | |||
| String FIND_ALL_GROUP_COMPUTE_RESOURCE_POLICY = "SELECT CR FROM "+ ComputeResourcePolicyEntity.class.getSimpleName() + " CR " + | |||
| "WHERE CR.groupResourceProfileId LIKE : " + DBConstants.GroupResourceProfile.GROUP_RESOURCE_PROFILE_ID; | |||
|
|
|||
| String GET_USER_RESOURCE_PROFILE = "SELECT DISTINCT URP FROM " + UserResourceProfileEntity.class.getSimpleName() + " URP " + | |||
There was a problem hiding this comment.
GET_USER_RESOURCE_PROFILE, GET_USER_COMPUTE_RESOURCE_PREFERENCE and GET_USER_STORAGE_PREFERENCE I don't think are needed if using the get() repository method as mentioned above.
| @@ -122,6 +122,9 @@ | |||
| <class>org.apache.airavata.registry.core.entities.appcatalog.StorageInterfacePK</class> | |||
There was a problem hiding this comment.
We can remove these Id classes, right?
There was a problem hiding this comment.
I've removed it. It's a part of the [https://github.com//pull/167] PR.
|
@machristie I've made the requested changes. |
Implementation of UserResourceProfileRepository.java instead of the existing implementation class dependency.
Changes made -