Repository: airavata Updated Branches: refs/heads/master 62aee2081 -> 777af1920
fixing test failures Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/777af192 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/777af192 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/777af192 Branch: refs/heads/master Commit: 777af1920801c76946b793b0b970730be2bcffd6 Parents: 62aee20 Author: scnakandala <[email protected]> Authored: Mon Dec 7 17:00:19 2015 -0500 Committer: scnakandala <[email protected]> Committed: Mon Dec 7 17:00:19 2015 -0500 ---------------------------------------------------------------------- .../apache/airavata/api/server/util/RegistryInitUtil.java | 2 +- .../core/experiment/catalog/ExpCatResourceUtils.java | 9 ++++++--- .../experiment/catalog/impl/ExperimentCatalogImpl.java | 4 ++-- .../core/experiment/catalog/impl/ProjectRegistry.java | 2 +- .../registry/core/experiment/catalog/model/UserPK.java | 8 -------- .../experiment/catalog/resources/GatewayResource.java | 5 ++++- .../experiment/catalog/resources/ProjectResource.java | 10 +++++----- .../experiment/catalog/resources/ProjectUserResource.java | 8 +------- .../core/experiment/catalog/resources/UserResource.java | 5 ++++- .../core/experiment/catalog/resources/WorkerResource.java | 5 ++++- .../airavata/experiment/catalog/AbstractResourceTest.java | 2 +- 11 files changed, 29 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java index a6a0fe7..82cedba 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java @@ -97,7 +97,7 @@ public class RegistryInitUtil { user = ExpCatResourceUtils.createUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserPassword(), ServerSettings.getDefaultUserGateway()); user.save(); }else { - user = (UserResource)ExpCatResourceUtils.getUser(ServerSettings.getDefaultUser()); + user = (UserResource)ExpCatResourceUtils.getUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserGateway()); } WorkerResource workerResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java index 3687156..2777ff0 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java @@ -92,7 +92,7 @@ public class ExpCatResourceUtils { userResource.setGatewayId(gatewayId); return userResource; }else { - return (UserResource)getUser(username); + return (UserResource)getUser(username, gatewayId); } } @@ -155,12 +155,15 @@ public class ExpCatResourceUtils { } - public static ExperimentCatResource getUser(String userName) throws RegistryException{ + public static ExperimentCatResource getUser(String userName, String gatewayId) throws RegistryException{ EntityManager em = null; try { if (isUserExist(userName)) { em = getEntityManager(); - Users user = em.find(Users.class, userName); + UserPK userPK = new UserPK(); + userPK.setUserName(userName); + userPK.setGatewayId(gatewayId); + Users user = em.find(Users.class, userPK); UserResource userResource = (UserResource)Utils.getResource(ResourceType.USER, user); em.close(); return userResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java index ece1863..7ef834e 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java @@ -72,7 +72,7 @@ public class ExperimentCatalogImpl implements ExperimentCatalog { user = ExpCatResourceUtils.createUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserPassword(), ServerSettings.getDefaultUserGateway()); user.save(); }else { - user = (UserResource) ExpCatResourceUtils.getUser(ServerSettings.getDefaultUser()); + user = (UserResource) ExpCatResourceUtils.getUser(ServerSettings.getDefaultUser(), ServerSettings.getDefaultUserGateway()); } experimentRegistry = new ExperimentRegistry(gatewayResource, user); projectRegistry = new ProjectRegistry(gatewayResource, user); @@ -95,7 +95,7 @@ public class ExperimentCatalogImpl implements ExperimentCatalog { user = ExpCatResourceUtils.createUser(username, password, gateway); user.save(); }else { - user = (UserResource) ExpCatResourceUtils.getUser(username); + user = (UserResource) ExpCatResourceUtils.getUser(username, gateway); } experimentRegistry = new ExperimentRegistry(gatewayResource, user); projectRegistry = new ProjectRegistry(gatewayResource, user); http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java index 6d6bfda..d29fbb3 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java @@ -111,7 +111,7 @@ public class ProjectRegistry { existingProject.setDescription(project.getDescription()); existingProject.setName(project.getName()); // existingProject.setGateway(gatewayResource); - UserResource user = (UserResource) ExpCatResourceUtils.getUser(project.getOwner()); + UserResource user = (UserResource) ExpCatResourceUtils.getUser(project.getOwner(),gatewayResource.getGatewayId()); if (!gatewayResource.isExists(ResourceType.GATEWAY_WORKER, user.getUserName())){ workerResource = ExpCatResourceUtils.addGatewayWorker(gatewayResource, user); }else { http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserPK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserPK.java index 4fb1a7c..9296b03 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserPK.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserPK.java @@ -32,14 +32,6 @@ public class UserPK implements Serializable { private String gatewayId; private String userName; - public UserPK() { - } - - public UserPK(String gatewayId, String userName) { - this.gatewayId = gatewayId; - this.userName = userName; - } - @Id @Column(name = "GATEWAY_ID") public String getGatewayId() { http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java index 15ead2d..8266543 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java @@ -376,7 +376,10 @@ public class GatewayResource extends AbstractExpCatResource { return existingWorker != null; case USER: em = ExpCatResourceUtils.getEntityManager(); - Users existingUser = em.find(Users.class, name); + UserPK userPK = new UserPK(); + userPK.setGatewayId(getGatewayId()); + userPK.setUserName(name.toString()); + Users existingUser = em.find(Users.class, userPK); em.close(); return existingUser != null; case EXPERIMENT: http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectResource.java index eabd8b0..b1738d2 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectResource.java @@ -23,10 +23,7 @@ package org.apache.airavata.registry.core.experiment.catalog.resources; import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource; import org.apache.airavata.registry.core.experiment.catalog.ResourceType; -import org.apache.airavata.registry.core.experiment.catalog.model.Experiment; -import org.apache.airavata.registry.core.experiment.catalog.model.Project; -import org.apache.airavata.registry.core.experiment.catalog.model.ProjectUser; -import org.apache.airavata.registry.core.experiment.catalog.model.Users; +import org.apache.airavata.registry.core.experiment.catalog.model.*; import org.apache.airavata.registry.core.experiment.catalog.utils.QueryGenerator; import org.apache.airavata.registry.cpi.RegistryException; import org.apache.airavata.registry.cpi.ResultOrderType; @@ -342,7 +339,10 @@ public class ProjectResource extends AbstractExpCatResource { project.setProjectId(id); project.setProjectName(name); project.setGatewayId(gatewayId); - Users user = em.find(Users.class, worker.getUser()); + UserPK userPK = new UserPK(); + userPK.setUserName(worker.getUser()); + userPK.setGatewayId(getGatewayId()); + Users user = em.find(Users.class, userPK); project.setUser(user); project.setUserName(user.getUserName()); project.setDescription(description); http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectUserResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectUserResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectUserResource.java index 3686204..ac2c0f1 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectUserResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProjectUserResource.java @@ -24,10 +24,7 @@ package org.apache.airavata.registry.core.experiment.catalog.resources; import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource; import org.apache.airavata.registry.core.experiment.catalog.ResourceType; -import org.apache.airavata.registry.core.experiment.catalog.model.ProjectUser; -import org.apache.airavata.registry.core.experiment.catalog.model.ProjectUserPK; -import org.apache.airavata.registry.core.experiment.catalog.model.Project; -import org.apache.airavata.registry.core.experiment.catalog.model.Users; +import org.apache.airavata.registry.core.experiment.catalog.model.*; import org.apache.airavata.registry.cpi.RegistryException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -97,15 +94,12 @@ public class ProjectUserResource extends AbstractExpCatResource { ProjectUser prUser = new ProjectUser(); prUser.setProjectId(projectId); prUser.setUserName(userName); - Users user = em.find(Users.class, userName); - prUser.setUser(user); Project project = em.find(Project.class, projectId); prUser.setProject(project); if (existingPrUser != null) { existingPrUser.setProjectId(projectId); existingPrUser.setUserName(userName); - existingPrUser.setUser(user); existingPrUser.setProject(project); em.merge(existingPrUser); } else { http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserResource.java index 9baff6a..49cb022 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserResource.java @@ -131,7 +131,10 @@ public class UserResource extends AbstractExpCatResource { EntityManager em = null; try { em = ExpCatResourceUtils.getEntityManager(); - Users existingUser = em.find(Users.class, new UserPK(userName, gatewayId)); + UserPK userPK = new UserPK(); + userPK.setGatewayId(gatewayId); + userPK.setUserName(userName); + Users existingUser = em.find(Users.class, userPK); Gateway gateway = em.find(Gateway.class, gatewayId); em.close(); http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java index 7acc1d7..bf04eff 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java @@ -251,7 +251,10 @@ public class WorkerResource extends AbstractExpCatResource { switch (type) { case PROJECT: generator = new QueryGenerator(PROJECT); - Users users = em.find(Users.class, getUser()); + UserPK userPK = new UserPK(); + userPK.setGatewayId(getGatewayId()); + userPK.setUserName(user); + Users users = em.find(Users.class, userPK); Gateway gatewayModel = em.find(Gateway.class, gatewayId); generator.setParameter("users", users); if (gatewayModel != null) { http://git-wip-us.apache.org/repos/asf/airavata/blob/777af192/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java index dc5501c..c52084d 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java @@ -52,7 +52,7 @@ public abstract class AbstractResourceTest { public void setUp() throws Exception { gatewayResource = (GatewayResource) ExpCatResourceUtils.getGateway(ServerSettings.getDefaultUserGateway()); workerResource = (WorkerResource) ExpCatResourceUtils.getWorker(gatewayResource.getGatewayName(), ServerSettings.getDefaultUser()); - userResource = (UserResource) ExpCatResourceUtils.getUser(ServerSettings.getDefaultUser()); + userResource = (UserResource) ExpCatResourceUtils.getUser(ServerSettings.getDefaultUser(), gatewayResource.getGatewayId()); projectResource = workerResource.getProject("default"); }
