Commit b5af5f42 authored by Matija Obreza's avatar Matija Obreza
Browse files

Renamed AclAssignerService** to AclService**

parent 39456426
......@@ -20,7 +20,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.genesys2.server.model.AclAwareModel;
import org.genesys2.server.service.AclAssignerService;
import org.genesys2.server.service.AclService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -33,7 +33,7 @@ public class AclAssignerAspect {
private static final Logger LOG = LoggerFactory.getLogger(AclAssignerAspect.class);
@Autowired
private AclAssignerService aclAssignerService;
private AclService aclAssignerService;
@Around("execution(* org.genesys2.server.persistence.domain.*.save(..))")
public Object aroundSaveAclObject(ProceedingJoinPoint pjp) throws Throwable {
......
......@@ -26,7 +26,7 @@ import org.genesys2.server.model.acl.AclSid;
import org.genesys2.server.security.AuthUserDetails;
import org.springframework.security.acls.model.Permission;
public interface AclAssignerService {
public interface AclService {
void addCreatorPermissions(AclAwareModel target);
......
......@@ -31,7 +31,7 @@ import org.genesys2.server.persistence.acl.AclEntryPersistence;
import org.genesys2.server.persistence.acl.AclObjectIdentityPersistence;
import org.genesys2.server.persistence.acl.AclSidPersistence;
import org.genesys2.server.security.AuthUserDetails;
import org.genesys2.server.service.AclAssignerService;
import org.genesys2.server.service.AclService;
import org.genesys2.server.service.UserService;
import org.genesys2.spring.SecurityContextUtil;
import org.slf4j.Logger;
......@@ -47,9 +47,9 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Service
@Transactional
public class AclAssignerServiceImpl implements AclAssignerService {
public class AclServiceImpl implements AclService {
private static final Logger LOG = LoggerFactory.getLogger(AclAssignerServiceImpl.class);
private static final Logger LOG = LoggerFactory.getLogger(AclServiceImpl.class);
private static ArrayList<Permission> basePermissions;
......
......@@ -70,7 +70,7 @@ import org.genesys2.server.persistence.domain.ParameterRepository;
import org.genesys2.server.persistence.domain.SvalbardRepository;
import org.genesys2.server.persistence.domain.TraitValueRepository;
import org.genesys2.server.security.AuthUserDetails;
import org.genesys2.server.service.AclAssignerService;
import org.genesys2.server.service.AclService;
import org.genesys2.server.service.DatasetService;
import org.genesys2.server.service.GenesysService;
import org.genesys2.server.service.HtmlSanitizer;
......@@ -138,7 +138,7 @@ public class GenesysServiceImpl implements GenesysService, TraitService, Dataset
private SvalbardRepository svalbardRepository;
@Autowired
private AclAssignerService aclService;
private AclService aclService;
@Autowired
private HtmlSanitizer htmlSanitizer;
......
......@@ -17,7 +17,7 @@
package org.genesys2.server.servlet.controller;
import org.genesys2.server.model.impl.Team;
import org.genesys2.server.service.AclAssignerService;
import org.genesys2.server.service.AclService;
import org.genesys2.server.service.ContentService;
import org.genesys2.server.service.InstituteService;
import org.genesys2.server.service.TeamService;
......@@ -48,7 +48,7 @@ public class TeamController extends BaseController {
private TeamService teamService;
@Autowired
private AclAssignerService aclService;
private AclService aclService;
@RequestMapping("")
@PreAuthorize("hasRole('ADMINISTRATOR')")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment