Replace @ExecuteOn(IO) with @ExecuteOn(BLOCKING)

server/src/main/java/com/objectcomputing/checkins/security/LocalLoginController.java

@@ -35,7 +35,7 @@
 
 @Requires(env = Environments.LOCAL)
 @Controller("/oauth/login/google")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_ANONYMOUS)
 public class LocalLoginController {
 

server/src/main/java/com/objectcomputing/checkins/services/action_item/ActionItemController.java

@@ -20,7 +20,7 @@
 import java.util.UUID;
 
 @Controller("/services/action-items")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "action-items")

server/src/main/java/com/objectcomputing/checkins/services/agenda_item/AgendaItemController.java

@@ -22,7 +22,7 @@
 import java.util.UUID;
 
 @Controller("/services/agenda-items")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "agenda-items")

server/src/main/java/com/objectcomputing/checkins/services/checkin_notes/CheckinNoteController.java

@@ -20,7 +20,7 @@
 import java.util.UUID;
 
 @Controller("/services/checkin-notes")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "checkin-notes")

server/src/main/java/com/objectcomputing/checkins/services/checkindocument/CheckinDocumentController.java

@@ -20,7 +20,7 @@
 import java.util.UUID;
 
 @Controller("/services/checkin-documents")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured({RoleType.Constants.ADMIN_ROLE, RoleType.Constants.PDL_ROLE})
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "checkin documents")

server/src/main/java/com/objectcomputing/checkins/services/checkins/CheckInController.java

@@ -22,7 +22,7 @@
 import java.util.UUID;
 
 @Controller("/services/check-ins")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/demographics/DemographicsController.java

@@ -20,7 +20,7 @@
 import java.util.stream.Collectors;
 
 @Controller("/services/demographics")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/email/EmailController.java

@@ -12,7 +12,7 @@
 import java.util.List;
 
 @Controller("/services/email")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 public class EmailController {
 

server/src/main/java/com/objectcomputing/checkins/services/employee_hours/EmployeeHoursController.java

@@ -20,7 +20,7 @@
 import java.util.UUID;
 
 @Controller("/services/employee/hours")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Tag(name="employee hours")
 public class EmployeeHoursController {

server/src/main/java/com/objectcomputing/checkins/services/feedback/suggestions/FeedbackSuggestionsController.java

@@ -17,7 +17,7 @@
 import java.util.UUID;
 
 @Controller("/services/feedback/suggestions")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/feedback_answer/FeedbackAnswerController.java

@@ -19,7 +19,7 @@
 import java.util.stream.Collectors;
 
 @Controller("/services/feedback/answers")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 public class FeedbackAnswerController {
 

server/src/main/java/com/objectcomputing/checkins/services/feedback_answer/question_and_answer/QuestionAndAnswerController.java

@@ -14,7 +14,7 @@
 import java.util.UUID;
 
 @Controller("/services/feedback/questions-and-answers")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 public class QuestionAndAnswerController {
 

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestController.java

@@ -26,7 +26,7 @@
 
 @Validated
 @Controller("/services/feedback/requests")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Tag(name = "feedback request")
 public class FeedbackRequestController {

server/src/main/java/com/objectcomputing/checkins/services/feedback_template/FeedbackTemplateController.java

@@ -19,7 +19,7 @@
 import java.util.stream.Collectors;
 
 @Controller("/services/feedback/templates")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/feedback_template/template_question/TemplateQuestionController.java

@@ -20,7 +20,7 @@
 import java.util.stream.Collectors;
 
 @Controller("/services/feedback/template_questions")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/file/FileController.java

@@ -24,7 +24,7 @@
 
 @Validated
 @Controller("/services/files")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Tag(name = "files")
 @Secured(SecurityRule.IS_AUTHENTICATED)
 public class FileController {

server/src/main/java/com/objectcomputing/checkins/services/github/GithubController.java

@@ -17,7 +17,7 @@
 
 
 @Controller("/services/github-issue")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "github")

server/src/main/java/com/objectcomputing/checkins/services/guild/GuildController.java

@@ -20,7 +20,7 @@
 import java.util.UUID;
 
 @Controller("/services/guilds")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "guilds")

server/src/main/java/com/objectcomputing/checkins/services/guild/member/GuildMemberController.java

@@ -19,7 +19,7 @@
 import java.util.UUID;
 
 @Controller("/services/guilds/members")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "guild-member")

server/src/main/java/com/objectcomputing/checkins/services/member_skill/MemberSkillController.java

@@ -21,7 +21,7 @@
 import java.util.UUID;
 
 @Controller("/services/member-skills")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "member-skills")

server/src/main/java/com/objectcomputing/checkins/services/member_skill/skillsreport/SkillsReportController.java

@@ -17,10 +17,8 @@
 
 import java.net.URI;
 
-;
-
 @Controller("/reports/skills")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/anniversaryreport/AnniversaryReportController.java

@@ -20,7 +20,7 @@
 import java.util.Set;
 
 @Controller("/services/reports/anniversaries")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/birthday/BirthDayController.java

@@ -20,7 +20,7 @@
 import java.util.Set;
 
 @Controller("/services/reports/birthdays")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/csvreport/MemberProfileReportController.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.ExecutorService;
 
 @Controller("/services/reports/member")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 public class MemberProfileReportController {
 

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/currentuser/CurrentUserController.java

@@ -24,7 +24,7 @@
 import java.util.stream.Collectors;
 
 @Controller("/services/member-profiles/current")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Tag(name = "current user")
 public class CurrentUserController {

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoController.java

@@ -17,7 +17,7 @@
 import static io.micronaut.http.HttpHeaders.CACHE_CONTROL;
 
 @Controller("/services/member-profiles/member-photos")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.IMAGE_PNG)
 @Tag(name = "member photo")

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/retentionreport/RetentionReportController.java

@@ -19,7 +19,7 @@
 import java.net.URI;
 
 @Controller("/reports/retention")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/opportunities/OpportunitiesController.java

@@ -22,7 +22,7 @@
 
 
 @Controller("/services/opportunities")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/permissions/PermissionController.java

@@ -15,7 +15,7 @@
 
 import java.util.List;
 
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/private_notes/PrivateNoteController.java

@@ -21,7 +21,7 @@
 import java.util.UUID;
 
 @Controller("/services/private-notes")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "private-notes")

server/src/main/java/com/objectcomputing/checkins/services/pulseresponse/PulseResponseController.java

@@ -22,7 +22,7 @@
 import java.util.UUID;
 
 @Controller("/services/pulse-responses")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/question_category/QuestionCategoryController.java

@@ -19,7 +19,7 @@
 import java.util.UUID;
 
 @Controller("/services/question-categories")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "question-categories")

server/src/main/java/com/objectcomputing/checkins/services/questions/QuestionController.java

@@ -21,7 +21,7 @@
 import java.util.stream.Collectors;
 
 @Controller("/services/questions")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "questions")

server/src/main/java/com/objectcomputing/checkins/services/request_notifications/CheckServicesController.java

@@ -11,7 +11,7 @@
 import reactor.core.publisher.Mono;
 
 @Controller("/services/feedback/daily-request-check")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @PermitAll
 public class CheckServicesController {
 

server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentController.java

@@ -24,7 +24,7 @@
 import java.util.stream.Collectors;
 
 @Controller("/services/review-assignments")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodController.java

@@ -29,7 +29,7 @@
 import java.util.UUID;
 
 @Controller("/services/review-periods")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/role/RoleController.java

@@ -19,7 +19,7 @@
 import java.util.UUID;
 
 @Controller("/services/roles")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "roles")

server/src/main/java/com/objectcomputing/checkins/services/role/member_roles/MemberRoleController.java

@@ -12,7 +12,7 @@
 import java.util.UUID;
 
 @Secured(SecurityRule.IS_ANONYMOUS)
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Controller("/services/roles/members")
 public class MemberRoleController {
 

server/src/main/java/com/objectcomputing/checkins/services/role/role_permissions/RolePermissionController.java

@@ -20,7 +20,7 @@
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 @Tag(name = "Role Permissions")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Controller("/services/roles/role-permissions")
 public class RolePermissionController {
 

server/src/main/java/com/objectcomputing/checkins/services/settings/SettingsController.java

@@ -21,9 +21,8 @@
 import java.util.List;
 import java.util.UUID;
 
-import static com.objectcomputing.checkins.services.settings.SettingsController.PATH;
-
-@Controller(PATH)
+@Controller(SettingsController.PATH)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
@@ -117,4 +116,4 @@ private SettingsResponseDTO fromEntity(Setting entity) {
         return dto;
     }
 }
-
+

server/src/main/java/com/objectcomputing/checkins/services/skill_record/SkillRecordController.java

@@ -18,7 +18,7 @@
 import java.io.File;
 
 @Controller("/services/skills/records")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 public class SkillRecordController {
 

server/src/main/java/com/objectcomputing/checkins/services/skillcategory/SkillCategoryController.java

@@ -21,7 +21,7 @@
 import java.util.UUID;
 
 @Controller("/services/skills/categories")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)

server/src/main/java/com/objectcomputing/checkins/services/skillcategory/skillcategory_skill/SkillCategorySkillController.java

@@ -17,7 +17,7 @@
 import java.net.URI;
 
 @Controller("/services/skills/category-skills")
-@ExecuteOn(TaskExecutors.IO)
+@ExecuteOn(TaskExecutors.BLOCKING)
 @Secured(SecurityRule.IS_AUTHENTICATED)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)