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/04/04 18:37:16 UTC
airavata git commit: fixing issue in updating sharing data models
Repository: airavata
Updated Branches:
refs/heads/develop 048a11bab -> 30ab06f3e
fixing issue in updating sharing data models
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/30ab06f3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/30ab06f3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/30ab06f3
Branch: refs/heads/develop
Commit: 30ab06f3efb945d5cf9d71fef026494b40a2fe47
Parents: 048a11b
Author: scnakandala <su...@gmail.com>
Authored: Tue Apr 4 14:37:14 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Apr 4 14:37:14 2017 -0400
----------------------------------------------------------------------
.../server/SharingRegistryServerHandler.java | 25 +++++++++++---------
.../registry/SharingRegistryServiceTest.java | 3 +++
2 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/30ab06f3/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index c1ec8dd..6bf6108 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.util.*;
public class SharingRegistryServerHandler implements SharingRegistryService.Iface{
@@ -1022,17 +1023,19 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
Field[] oldEntityFields = oldEntityClass.getDeclaredFields();
for (Field field : oldEntityFields){
- field.setAccessible(true);
- Object o = newHT.get(field.getName());
- if (o != null){
- Field f = null;
- try {
- f = oldEntityClass.getDeclaredField(field.getName());
- f.setAccessible(true);
- logger.debug("setting " + f.getName());
- f.set(oldEntity, o);
- } catch (Exception e) {
- throw new SharingRegistryException(e.getMessage());
+ if (!Modifier.isFinal(field.getModifiers())) {
+ field.setAccessible(true);
+ Object o = newHT.get(field.getName());
+ if (o != null) {
+ Field f = null;
+ try {
+ f = oldEntityClass.getDeclaredField(field.getName());
+ f.setAccessible(true);
+ logger.debug("setting " + f.getName());
+ f.set(oldEntity, o);
+ } catch (Exception e) {
+ throw new SharingRegistryException(e.getMessage());
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/30ab06f3/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
index a8c177a..424e999 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
@@ -147,6 +147,9 @@ public class SharingRegistryServiceTest {
userGroup1.setGroupType(GroupType.USER_LEVEL_GROUP);
sharingServiceClient.createGroup(userGroup1);
+ userGroup1.setDescription("updated description");
+ sharingServiceClient.updateGroup(userGroup1);
+ Assert.assertTrue(sharingServiceClient.getGroup(domainId, userGroup1.groupId).description.equals("updated description"));
Assert.assertTrue(sharingServiceClient.isGroupExists(domainId, "test-group-1"));
UserGroup userGroup2 = new UserGroup();