SHIBUI-1848

Moved user groups to security package
TIER · Jun 23, 2021 · 58cf987 · 58cf987
1 parent c111333
commit 58cf987
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.../admin/ui/controller/GroupController.java → .../security/controller/GroupController.java b/.../admin/ui/controller/GroupController.java → .../security/controller/GroupController.java
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.controller;
+package edu.internet2.tier.shibboleth.admin.ui.security.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -15,8 +15,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
-import edu.internet2.tier.shibboleth.admin.ui.service.IGroupService;
+import edu.internet2.tier.shibboleth.admin.ui.controller.ErrorResponse;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.service.IGroupService;
 
 @Controller
 @RequestMapping(value = "/api/groups")

diff --git a/...ier/shibboleth/admin/ui/domain/Group.java → ...boleth/admin/ui/security/model/Group.java b/...ier/shibboleth/admin/ui/domain/Group.java → ...boleth/admin/ui/security/model/Group.java
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.domain;
+package edu.internet2.tier.shibboleth.admin.ui.security.model;
 
 import java.util.UUID;
 

diff --git a/.../admin/ui/repository/GroupRepository.java → .../security/repository/GroupRepository.java b/.../admin/ui/repository/GroupRepository.java → .../security/repository/GroupRepository.java
@@ -1,10 +1,10 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
+package edu.internet2.tier.shibboleth.admin.ui.security.repository;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 
 public interface GroupRepository extends JpaRepository<Group, String> {
     List<Group> findAll();

diff --git a/...th/admin/ui/service/GroupServiceImpl.java → ...ui/security/service/GroupServiceImpl.java b/...th/admin/ui/service/GroupServiceImpl.java → ...ui/security/service/GroupServiceImpl.java
@@ -1,12 +1,12 @@
-package edu.internet2.tier.shibboleth.admin.ui.service;
+package edu.internet2.tier.shibboleth.admin.ui.security.service;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
-import edu.internet2.tier.shibboleth.admin.ui.repository.GroupRepository;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.repository.GroupRepository;
 
 @Service
 public class GroupServiceImpl implements IGroupService {

diff --git a/...oleth/admin/ui/service/IGroupService.java → ...in/ui/security/service/IGroupService.java b/...oleth/admin/ui/service/IGroupService.java → ...in/ui/security/service/IGroupService.java
@@ -1,8 +1,8 @@
-package edu.internet2.tier.shibboleth.admin.ui.service;
+package edu.internet2.tier.shibboleth.admin.ui.security.service;
 
 import java.util.List;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 
 public interface IGroupService {
 

diff --git a/...ui/repository/GroupRepositoryTests.groovy → ...ty/repository/GroupRepositoryTests.groovy b/...ui/repository/GroupRepositoryTests.groovy → ...ty/repository/GroupRepositoryTests.groovy
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository
+package edu.internet2.tier.shibboleth.admin.ui.security.repository
 
 import javax.persistence.EntityManager
 
@@ -9,8 +9,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 import org.springframework.test.context.ContextConfiguration
 
 import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition
-import edu.internet2.tier.shibboleth.admin.ui.domain.Group
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group
 import spock.lang.Specification
 
 /**