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/06/09 18:07:05 UTC
[airavata-custos] branch develop updated: Fix for #195
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new 55ff5ae Fix for #195
new 54babd2 Merge pull request #199 from isururanawaka/develop
55ff5ae is described below
commit 55ff5aecbf71bfdf6831b407d25ca181387dac5a
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Wed Jun 9 14:06:07 2021 -0400
Fix for #195
---
.../user/profile/mapper/UserProfileMapper.java | 6 +++---
.../user/profile/service/UserProfileService.java | 2 +-
.../src/main/proto/UserProfileService.proto | 2 +-
.../commons/utils/InterServiceModelMapper.java | 2 +-
.../scim/resource/manager/ResourceManager.java | 2 +-
.../main/resources/tenant-management-service.pb | Bin 154494 -> 154580 bytes
.../service/TenantManagementService.java | 2 +-
.../src/main/resources/user-management-service.pb | Bin 125267 -> 125269 bytes
.../management/service/UserManagementService.java | 5 ++---
9 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/mapper/UserProfileMapper.java b/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/mapper/UserProfileMapper.java
index efcd135..7851366 100644
--- a/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/mapper/UserProfileMapper.java
+++ b/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/mapper/UserProfileMapper.java
@@ -76,8 +76,8 @@ public class UserProfileMapper {
userProfile.getAttributesList().forEach(atr -> {
- if (atr.getValueList() != null && !atr.getValueList().isEmpty()) {
- for (String value : atr.getValueList()) {
+ if (atr.getValuesList() != null && !atr.getValuesList().isEmpty()) {
+ for (String value : atr.getValuesList()) {
UserAttribute userAttribute = new UserAttribute();
userAttribute.setKey(atr.getKey());
userAttribute.setValue(value);
@@ -167,7 +167,7 @@ public class UserProfileMapper {
.UserAttribute
.newBuilder()
.setKey(key)
- .addAllValue(atrMap.get(key))
+ .addAllValues(atrMap.get(key))
.build();
attributeList.add(attribute);
});
diff --git a/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java b/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java
index 661ed87..74bcb06 100644
--- a/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java
+++ b/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java
@@ -272,7 +272,7 @@ public class UserProfileService extends UserProfileServiceGrpc.UserProfileServic
List<org.apache.custos.user.profile.service.UserProfile> userProfileList = new ArrayList<>();
attributeList.forEach(atr -> {
- List<String> values = atr.getValueList();
+ List<String> values = atr.getValuesList();
values.forEach(val -> {
List<UserProfile>
userAttributes = userAttributeRepository.findFilteredUserProfiles(atr.getKey(), val);
diff --git a/custos-core-services/user-profile-core-service/src/main/proto/UserProfileService.proto b/custos-core-services/user-profile-core-service/src/main/proto/UserProfileService.proto
index feef80d..94711b1 100644
--- a/custos-core-services/user-profile-core-service/src/main/proto/UserProfileService.proto
+++ b/custos-core-services/user-profile-core-service/src/main/proto/UserProfileService.proto
@@ -79,7 +79,7 @@ message UserProfileRequest {
message UserAttribute {
int64 id = 1;
string key = 2;
- repeated string value = 3;
+ repeated string values = 3;
}
diff --git a/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/utils/InterServiceModelMapper.java b/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/utils/InterServiceModelMapper.java
index 9bfeb01..0ba9df9 100644
--- a/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/utils/InterServiceModelMapper.java
+++ b/custos-integration-services/custos-integration-services-commons/src/main/java/org/apache/custos/integration/services/commons/utils/InterServiceModelMapper.java
@@ -48,7 +48,7 @@ public class InterServiceModelMapper {
org.apache.custos.user.profile.service.UserAttribute
.newBuilder()
.setKey(atr.getKey())
- .addAllValue(atr.getValuesList())
+ .addAllValues(atr.getValuesList())
.build();
userAtrList.add(userAttribute);
diff --git a/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java b/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java
index b03e183..5b1bd5e 100644
--- a/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java
+++ b/custos-integration-services/scim-service/src/main/java/org/apache/custos/scim/resource/manager/ResourceManager.java
@@ -769,7 +769,7 @@ public class ResourceManager implements UserManager {
org.apache.custos.user.profile.service.UserAttribute
.newBuilder()
.setKey(atr.getKey())
- .addAllValue(atr.getValuesList())
+ .addAllValues(atr.getValuesList())
.build();
userAtrList.add(userAttribute);
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/src/main/resources/tenant-management-service.pb b/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/src/main/resources/tenant-management-service.pb
index e5e0672..6a14c0a 100644
Binary files a/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/src/main/resources/tenant-management-service.pb and b/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/src/main/resources/tenant-management-service.pb differ
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java
index eb40cd2..c175f69 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/java/org/apache/custos/tenant/management/service/TenantManagementService.java
@@ -860,7 +860,7 @@ public class TenantManagementService extends TenantManagementServiceImplBase {
org.apache.custos.user.profile.service.UserAttribute
.newBuilder()
.setKey(atr.getKey())
- .addAllValue(atr.getValuesList())
+ .addAllValues(atr.getValuesList())
.build();
userAtrList.add(userAttribute);
diff --git a/custos-integration-services/user-management-service-parent/user-management-service-sidecar/src/main/resources/user-management-service.pb b/custos-integration-services/user-management-service-parent/user-management-service-sidecar/src/main/resources/user-management-service.pb
index b4aa501..fa89351 100644
Binary files a/custos-integration-services/user-management-service-parent/user-management-service-sidecar/src/main/resources/user-management-service.pb and b/custos-integration-services/user-management-service-parent/user-management-service-sidecar/src/main/resources/user-management-service.pb differ
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/service/UserManagementService.java b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/service/UserManagementService.java
index e38868a..d02f9a9 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/service/UserManagementService.java
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/java/org/apache/custos/user/management/service/UserManagementService.java
@@ -125,7 +125,7 @@ public class UserManagementService extends UserManagementServiceGrpc.UserManagem
org.apache.custos.user.profile.service.UserAttribute
.newBuilder()
.setKey(atr.getKey())
- .addAllValue(atr.getValuesList())
+ .addAllValues(atr.getValuesList())
.build();
userAtrList.add(userAttribute);
@@ -1342,9 +1342,8 @@ public class UserManagementService extends UserManagementServiceGrpc.UserManagem
org.apache.custos.user.profile.service.UserAttribute
.newBuilder()
.setKey(atr.getKey())
- .addAllValue(atr.getValuesList())
+ .addAllValues(atr.getValuesList())
.build();
-
userAtrList.add(userAttribute);
});
profileBuilder.addAllAttributes(userAtrList);