You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/04/22 17:51:24 UTC
[airavata-custos] branch staging updated: Add repository
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/staging by this push:
new 1502ed0 Add repository
new 94533a8 Merge pull request #151 from isururanawaka/staging
1502ed0 is described below
commit 1502ed052b00c0475a77530fc6fe83ba11632736
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu Apr 22 13:50:03 2021 -0400
Add repository
---
.../persistance/respository/SearchTenantRepositoryImpl.java | 4 ++--
pom.xml | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java b/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
index 47f6840..09d321e 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
+++ b/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
@@ -57,12 +57,12 @@ public class SearchTenantRepositoryImpl implements SearchTenantRepository {
Map<String, Object> valueMap) {
String query = "SELECT * FROM tenant E WHERE ";
- if (requestEmail != null) {
+ if (requestEmail != null && !requestEmail.isEmpty()) {
query = query + "E.requester_email = :" + "requester_email" + " AND ";
valueMap.put("requester_email", requestEmail);
}
- if (status != null) {
+ if (status != null && !status.isEmpty()) {
query = query + "E.status LIKE :" + "status" + " AND ";
valueMap.put("status", status);
}
diff --git a/pom.xml b/pom.xml
index 1b2cc0b..81d52df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,11 +312,19 @@
<id>container</id>
<properties>
<spring.profiles.active>staging</spring.profiles.active>
- <vault.token>s.SI6Bnv0uLhFgEn4mI2tq8HmQ</vault.token>
+ <vault.token>token</vault.token>
<vault.scheme>http</vault.scheme>
<vault.host>vault.vault.svc.cluster.local</vault.host>
<vault.port>8200</vault.port>
<vault.uri>http://vault.vault.svc.cluster.local:8200</vault.uri>
+ <iam.dev.username>token</iam.dev.username>
+ <iam.dev.password>token</iam.dev.password>
+ <iam.staging.username>token</iam.staging.username>
+ <iam.staging.password>token==</iam.staging.password>
+ <cilogon.dev.id>token</cilogon.dev.id>
+ <cilogon.dev.sec>token</cilogon.dev.sec>
+ <cilogon.staging.id>token</cilogon.staging.id>
+ <cilogon.staging.password>token</cilogon.staging.password>
</properties>
<activation>
<activeByDefault>true</activeByDefault>