diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java index 5763e451cb..17e43c26e3 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java @@ -78,6 +78,8 @@ import org.alfresco.util.AlfrescoCollator; import org.alfresco.util.Pair; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -94,6 +96,8 @@ public class GroupsImpl implements Groups private static final String AUTHORITY_NAME = "authorityName"; private static final String ERR_MSG_MODIFY_FIXED_AUTHORITY = "Trying to modify a fixed authority"; + protected static final Logger logger = LoggerFactory.getLogger(GroupsImpl.class); + private final static Map SORT_PARAMS_TO_NAMES; static { @@ -136,7 +140,7 @@ public class GroupsImpl implements Groups public Group create(Group group, Parameters parameters) { - System.out.println("Create from impl called"); + logger.info("Create from impl called"); validateGroup(group, false); // Create authority with default zones. @@ -152,7 +156,7 @@ public class GroupsImpl implements Groups { props.put(ContentModel.PROP_DESCRIPTION, group.getDescription()); } - System.out.println("Before authority created"); + logger.info("Before authority created"); String authority = authorityService.createAuthority(AuthorityType.GROUP, group.getId(), authorityDisplayName, authorityZones, props); // Set a given child authority to be included by the given parent diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java index 2728d24257..68a02484cd 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java @@ -49,6 +49,9 @@ import org.junit.Test; import org.mockito.Mock; import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.*; import static org.junit.Assert.assertEquals; @@ -70,6 +73,8 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest private static final String GROUP_EVERYONE = "GROUP_EVERYONE"; private static final String INCLUDE_DESCRIPTION_HAS_SUBGROUPS = "description,hasSubgroups"; + protected static final Logger logger = LoggerFactory.getLogger(GroupsTest.class); + protected AuthorityService authorityService; private String rootGroupName; @@ -1426,7 +1431,7 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest Group group = generateGroup(); group.setDescription("testDesc"); - System.out.println("" + otherParams); + logger.info("" + otherParams); Group createdGroup01 = groupsProxy.createGroup(group, otherParams, HttpServletResponse.SC_CREATED); assertNotNull(createdGroup01); diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java index 4bc4a02a4c..03a70f20a6 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java @@ -37,6 +37,8 @@ import org.alfresco.rest.api.tests.client.PublicApiClient.ExpectedPaging; import org.alfresco.rest.api.tests.client.PublicApiClient.ListResponse; import org.json.simple.JSONArray; import org.json.simple.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Represents a group. @@ -48,6 +50,7 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ { private static final long serialVersionUID = -3580248429177260831L; + protected static final Logger logger = LoggerFactory.getLogger(Group.class); @Override public void expected(Object o) @@ -112,7 +115,7 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ Boolean hasSubgroups = (Boolean) jsonObject.get("hasSubgroups"); List parentIds = (List) jsonObject.get("parentIds"); List zones = (List) jsonObject.get("zones"); - System.out.println("Parse group: " + description + " " + displayName); + logger.info("Parse group: " + description + " " + displayName); Group group = new Group(); group.setId(id); group.setDisplayName(displayName); diff --git a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java index bdfd8b40cd..4b7b7c8125 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java +++ b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java @@ -398,6 +398,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor } NodeRef childRef; NodeRef authorityContainerRef = getAuthorityContainer(); + logger.info("AuthorityDAO before create node"); childRef = nodeService.createNode(authorityContainerRef, ContentModel.ASSOC_CHILDREN, QName.createQName("cm", name, namespacePrefixResolver), ContentModel.TYPE_AUTHORITY_CONTAINER, props).getChildRef(); if (authorityZones != null) diff --git a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java index 4d992b0930..343c5cb54d 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java @@ -57,6 +57,8 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.QName; import org.alfresco.util.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.extensions.surf.util.ParameterCheck; @@ -68,6 +70,7 @@ import org.springframework.extensions.surf.util.ParameterCheck; public class AuthorityServiceImpl implements AuthorityService, InitializingBean { public static final String GROUP_ALFRESCO_SYSTEM_ADMINISTRATORS_AUTHORITY = PermissionService.GROUP_PREFIX + "ALFRESCO_SYSTEM_ADMINISTRATORS"; + protected static final Logger logger = LoggerFactory.getLogger(AuthorityServiceImpl.class); private static Set DEFAULT_ZONES = new HashSet(); @@ -668,7 +671,7 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean { checkTypeIsMutable(type); String name = getName(type, shortName); - System.out.println("Before authority DAO created"); + logger.info("Before authority DAO created"); authorityDAO.createAuthority(name, authorityDisplayName, authorityZones, properties); return name;