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/02/15 20:51:17 UTC
airavata git commit: TODO replace plain SQL with prepared statements
Repository: airavata
Updated Branches:
refs/heads/develop 84fcd360d -> a7b7fe6b6
TODO replace plain SQL with prepared statements
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a7b7fe6b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a7b7fe6b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a7b7fe6b
Branch: refs/heads/develop
Commit: a7b7fe6b6c80d4e12c4f5a4d664917b0c2d82fe2
Parents: 84fcd36
Author: scnakandala <su...@gmail.com>
Authored: Wed Feb 15 15:51:13 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Feb 15 15:51:13 2017 -0500
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 1 +
.../registry/db/repositories/GroupMembershipRepository.java | 2 ++
.../sharing/registry/db/repositories/SharingRepository.java | 2 ++
.../sharing/registry/db/repositories/UserGroupRepository.java | 1 +
.../airavata/sharing/registry/db/repositories/UserRepository.java | 1 +
5 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7b7fe6b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index 57f364e..a221fb6 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -48,6 +48,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
return select(filters, 0, -1);
}
+ //TODO Replace with prepared statements
public List<Entity> searchEntities(String domainId, List<String> groupIds, List<SearchCriteria> filters,
int offset, int limit) throws SharingRegistryException {
String groupIdString = "'";
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7b7fe6b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
index 32666a2..3918ea4 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
@@ -35,6 +35,7 @@ public class GroupMembershipRepository extends AbstractRepository<GroupMembershi
super(GroupMembership.class, GroupMembershipEntity.class);
}
+ //TODO Replace with prepared statements
public List<User> getAllChildUsers(String domainId, String groupId) throws SharingRegistryException {
String queryString = "SELECT DISTINCT U FROM " + UserEntity.class.getSimpleName() + " U, " + GroupMembershipEntity.class.getSimpleName()
+ " GM WHERE GM." + DBConstants.GroupMembershipTable.CHILD_ID + " = U." + DBConstants.UserTable.USER_ID + " AND " +
@@ -47,6 +48,7 @@ public class GroupMembershipRepository extends AbstractRepository<GroupMembershi
return users;
}
+ //TODO Replace with prepared statements
public List<UserGroup> getAllChildGroups(String domainId, String groupId) throws SharingRegistryException {
String queryString = "SELECT DISTINCT G FROM " + UserGroupEntity.class.getSimpleName() + " G, " + GroupMembershipEntity.class.getSimpleName()
+ " GM WHERE GM." + DBConstants.GroupMembershipTable.CHILD_ID + " = G." + DBConstants.UserGroupTable.GROUP_ID + " AND " +
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7b7fe6b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
index a9a6b5d..7845fb1 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
@@ -49,6 +49,7 @@ public class SharingRepository extends AbstractRepository<Sharing, SharingEntity
return select(filters, 0, -1);
}
+ //TODO Replace with prepared statements
public List<Sharing> getCascadingPermissionsForEntity(String domainId, String entityId) throws SharingRegistryException {
String query = "SELECT DISTINCT p from " + SharingEntity.class.getSimpleName() + " as p";
query += " WHERE ";
@@ -60,6 +61,7 @@ public class SharingRepository extends AbstractRepository<Sharing, SharingEntity
return select(query, 0, -1);
}
+ //TODO Replace with prepared statements
public boolean hasAccess(String domainId, String entityId, List<String> groupIds, List<String> permissionTypeIds) throws SharingRegistryException {
String query = "SELECT p from " + SharingEntity.class.getSimpleName() + " as p";
query += " WHERE ";
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7b7fe6b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
index 778ecde..c3a31c0 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
@@ -39,6 +39,7 @@ public class UserGroupRepository extends AbstractRepository<UserGroup, UserGroup
super(UserGroup.class, UserGroupEntity.class);
}
+ //TODO Replace with prepared statements
public List<UserGroup> getAccessibleGroups(String domainId, String entityId, String permissionTypeId) throws SharingRegistryException {
String query = "SELECT DISTINCT g from " + UserGroupEntity.class.getSimpleName() + " g, " + SharingEntity.class.getSimpleName() + " s";
query += " WHERE ";
http://git-wip-us.apache.org/repos/asf/airavata/blob/a7b7fe6b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
index b3ae341..6d78fd8 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
@@ -40,6 +40,7 @@ public class UserRepository extends AbstractRepository<User, UserEntity, UserPK>
}
+ //TODO Replace with prepared statements
public List<User> getAccessibleUsers(String domainId, String entityId, String permissionTypeId) throws SharingRegistryException {
String query = "SELECT DISTINCT u from " + UserEntity.class.getSimpleName() + " u, " + SharingEntity.class.getSimpleName() + " s";
query += " WHERE ";