Move skillcategory_skill package into skillcategory package

pieperm · pieperm · commit 46f3beb30277 · 2024-03-21T15:31:39.000-05:00
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skill_record/SkillRecord.java b/server/src/main/java/com/objectcomputing/checkins/services/skill_record/SkillRecord.java
@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.skill_record;
 
-import com.objectcomputing.checkins.services.skillcategory_skill.SkillCategorySkillId;
+import com.objectcomputing.checkins.services.skillcategory.skillcategory_skill.SkillCategorySkillId;
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.data.annotation.MappedEntity;
 
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skill_record/SkillRecordRepository.java b/server/src/main/java/com/objectcomputing/checkins/services/skill_record/SkillRecordRepository.java
@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.skill_record;
 
-import com.objectcomputing.checkins.services.skillcategory_skill.SkillCategorySkillId;
+import com.objectcomputing.checkins.services.skillcategory.skillcategory_skill.SkillCategorySkillId;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.data.jdbc.annotation.JdbcRepository;
 import io.micronaut.data.model.query.builder.sql.Dialect;
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/SkillCategoryServicesImpl.java b/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/SkillCategoryServicesImpl.java
@@ -3,7 +3,7 @@
 import com.objectcomputing.checkins.exceptions.AlreadyExistsException;
 import com.objectcomputing.checkins.exceptions.BadArgException;
 import com.objectcomputing.checkins.exceptions.NotFoundException;
-import com.objectcomputing.checkins.services.skillcategory_skill.SkillCategorySkillServices;
+import com.objectcomputing.checkins.services.skillcategory.skillcategory_skill.SkillCategorySkillServices;
 import com.objectcomputing.checkins.services.skills.Skill;
 import jakarta.inject.Singleton;
 
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkill.java b/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkill.java
@@ -1,4 +1,4 @@
-package com.objectcomputing.checkins.services.skillcategory_skill;
+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.data.annotation.MappedEntity;
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillController.java b/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillController.java
@@ -1,4 +1,4 @@
-package com.objectcomputing.checkins.services.skillcategory_skill;
+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;
 
 import com.objectcomputing.checkins.security.permissions.Permissions;
 import com.objectcomputing.checkins.services.permissions.RequiredPermission;
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillId.java b/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillId.java
@@ -1,5 +1,4 @@
-package com.objectcomputing.checkins.services.skillcategory_skill;
-
+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.micronaut.core.annotation.Introspected;
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillRepository.java b/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillRepository.java
@@ -1,4 +1,4 @@
-package com.objectcomputing.checkins.services.skillcategory_skill;
+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;
 
 import com.objectcomputing.checkins.services.skills.Skill;
 import io.micronaut.core.annotation.NonNull;
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillServices.java b/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillServices.java
@@ -1,4 +1,4 @@
-package com.objectcomputing.checkins.services.skillcategory_skill;
+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;
 
 import com.objectcomputing.checkins.services.skills.Skill;
 
diff --git a/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillServicesImpl.java b/server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillServicesImpl.java
@@ -1,4 +1,4 @@
-package com.objectcomputing.checkins.services.skillcategory_skill;
+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;
 
 import com.objectcomputing.checkins.services.skills.Skill;
 import jakarta.inject.Singleton;
diff --git a/server/src/test/java/com/objectcomputing/checkins/services/fixture/RepositoryFixture.java b/server/src/test/java/com/objectcomputing/checkins/services/fixture/RepositoryFixture.java
@@ -26,9 +26,8 @@
 import com.objectcomputing.checkins.services.role.member_roles.MemberRoleRepository;
 import com.objectcomputing.checkins.services.role.role_permissions.RolePermissionRepository;
 import com.objectcomputing.checkins.services.settings.SettingsRepository;
-import com.objectcomputing.checkins.services.skill_record.SkillRecordRepository;
 import com.objectcomputing.checkins.services.skillcategory.SkillCategoryRepository;
-import com.objectcomputing.checkins.services.skillcategory_skill.SkillCategorySkillRepository;
+import com.objectcomputing.checkins.services.skillcategory.skillcategory_skill.SkillCategorySkillRepository;
 import com.objectcomputing.checkins.services.skills.SkillRepository;
 import com.objectcomputing.checkins.services.tags.entityTag.EntityTagRepository;
 import com.objectcomputing.checkins.services.tags.TagRepository;
@@ -189,8 +188,4 @@ default SkillCategoryRepository getSkillCategoryRepository() {
     default SkillCategorySkillRepository getSkillCategorySkillRepository() {
         return getEmbeddedServer().getApplicationContext().getBean(SkillCategorySkillRepository.class);
     }
-
-    default SkillRecordRepository getSkillRecordRepository() {
-        return getEmbeddedServer().getApplicationContext().getBean(SkillRecordRepository.class);
-    }
 }
diff --git a/server/src/test/java/com/objectcomputing/checkins/services/fixture/SkillCategorySkillFixture.java b/server/src/test/java/com/objectcomputing/checkins/services/fixture/SkillCategorySkillFixture.java
@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.fixture;
 
-import com.objectcomputing.checkins.services.skillcategory_skill.SkillCategorySkill;
+import com.objectcomputing.checkins.services.skillcategory.skillcategory_skill.SkillCategorySkill;
 
 import java.util.UUID;
 
diff --git a/server/src/test/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillControllerTest.java b/server/src/test/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillControllerTest.java
@@ -1,4 +1,4 @@
-package com.objectcomputing.checkins.services.skillcategory_skill;
+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;
 
 import com.objectcomputing.checkins.services.TestContainersSuite;
 import com.objectcomputing.checkins.services.fixture.RoleFixture;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.objectcomputing.checkins.services.skillcategory_skill;`
	`1`	`+package com.objectcomputing.checkins.services.skillcategory.skillcategory_skill;`
`2`	`2`
`3`	`3`	`import io.micronaut.core.annotation.Introspected;`
`4`	`4`	`import io.micronaut.data.annotation.MappedEntity;`