From 65b6e7276edebce2f778959c6be977fb9b4734bf Mon Sep 17 00:00:00 2001 From: "Mark H. Wood" Date: Wed, 3 Feb 2016 12:46:43 -0500 Subject: [PATCH] [DS-3024] Move permanence logic from entity class to its service class. --- dspace-api/src/main/java/org/dspace/eperson/Group.java | 7 ++----- .../src/main/java/org/dspace/eperson/GroupServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/eperson/Group.java b/dspace-api/src/main/java/org/dspace/eperson/Group.java index 21c2947575..8761f11fbf 100644 --- a/dspace-api/src/main/java/org/dspace/eperson/Group.java +++ b/dspace-api/src/main/java/org/dspace/eperson/Group.java @@ -203,11 +203,8 @@ public class Group extends DSpaceObject implements DSpaceObjectLegacySupport /** Change the name of this Group. */ public void setName(Context context, String name) throws SQLException { - if (!permanent) - getGroupService().setMetadataSingleValue(context, this, - MetadataSchema.DC_SCHEMA, "title", null, null, name); - else - throw new SQLException("Attempt to rename a permanent Group"); + getGroupService().setMetadataSingleValue(context, this, + MetadataSchema.DC_SCHEMA, "title", null, null, name); } public boolean isGroupsChanged() { diff --git a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java index 4c4d2804a1..3ba80de5e1 100644 --- a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java @@ -90,7 +90,10 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl implements @Override public void setName(Context context, Group group, String name) throws SQLException { - group.setName(context, name); + if (!group.isPermanent()) + group.setName(context, name); + else + throw new SQLException("Attempt to rename a permanent Group"); } @Override