From 8669004979638093bf549ed3b0cca774b9cf1997 Mon Sep 17 00:00:00 2001 From: Jarold Wong Date: Thu, 8 Feb 2024 15:57:15 -0800 Subject: [PATCH] Upgrade to Spring Boot 3.2 (#390) * migrate javax to jakarta; cleanup imports * fix typo * use plugins dsl * javax.inject to jakarta.inject * update CAS config * update CORS config * update logback * update Flyway * clean up dependencies * update jwt library * update javers * update poi * bump misc dependencies * clean up dependencies * fix associations * SB 3.1.x * SB 3.2.x * remove buildHealth plugin --- build.gradle | 74 +++++++------------ .../java/edu/ucdavis/dss/ipa/Application.java | 7 +- .../ActivityLogViewController.java | 2 +- .../components/admin/AdminViewController.java | 2 +- .../views/factories/JpaAdminViewFactory.java | 3 +- .../assignment/AssignmentViewController.java | 6 +- .../AssignmentViewCourseController.java | 2 +- ...tViewScheduleInstructorNoteController.java | 2 +- .../AssignmentViewSectionGroupController.java | 2 +- ...nmentViewTeachingAssignmentController.java | 4 +- ...mentViewTeachingCallReceiptController.java | 4 +- ...entViewTeachingCallResponseController.java | 4 +- .../assignment/views/AssignmentExcelView.java | 4 +- .../factories/JpaAssignmentViewFactory.java | 2 +- .../auditLog/views/AuditLogExcelView.java | 4 +- .../api/components/auth/AuthController.java | 47 +++++++----- .../budget/BudgetViewController.java | 11 +-- .../views/BudgetComparisonExcelView.java | 4 +- .../budget/views/BudgetExcelView.java | 4 +- .../views/factories/JpaBudgetViewFactory.java | 2 +- .../course/CourseViewController.java | 7 +- .../course/views/CourseExcelView.java | 4 +- .../views/factories/JpaAnnualViewFactory.java | 2 +- ...ructionalSupportAssignmentsController.java | 6 +- .../InstructionalSupportCallsController.java | 4 +- ...ionalSupportInstructorFormsController.java | 2 +- ...uctionalSupportStudentFormsController.java | 4 +- .../views/InstructionalSupportExcelView.java | 4 +- .../JpaInstructionalSupportViewFactory.java | 2 +- ...gistrarReconciliationReportController.java | 8 +- .../views/ActivityDiffDto.java | 2 +- .../views/InstructorDiffDto.java | 2 +- .../views/SectionDiffDto.java | 2 +- .../views/factories/JpaReportViewFactory.java | 4 +- .../ScheduleSummaryReportController.java | 6 +- .../ScheduleSummaryReportAnnualExcelView.java | 4 +- .../views/ScheduleSummaryReportExcelView.java | 4 +- .../JpaScheduleSummaryViewFactory.java | 2 +- .../scheduling/SchedulingViewController.java | 4 +- .../factories/JpaSchedulingViewFactory.java | 2 +- .../api/components/site/SiteController.java | 6 +- .../summary/SummaryViewController.java | 2 +- .../factories/JpaSummaryViewFactory.java | 3 +- .../SupportCallResponseReportController.java | 6 +- .../SupportCallResponseReportExcelView.java | 4 +- ...aSupportCallResponseReportViewFactory.java | 4 +- .../TeachingCallFormViewController.java | 2 +- .../TeachingCallStatusViewController.java | 2 +- .../factories/JpaTeachingCallViewFactory.java | 2 +- .../TeachingCallResponseReportController.java | 6 +- .../TeachingCallResponseReportExcelView.java | 7 +- ...TeachingCallResponseReportViewFactory.java | 2 +- .../workgroup/WorkgroupViewController.java | 4 +- .../WorkgroupViewLocationController.java | 2 +- .../workgroup/WorkgroupViewTagController.java | 2 +- .../WorkgroupViewUserController.java | 4 +- .../factories/JpaWorkgroupViewFactory.java | 2 +- .../WorkloadSummaryReportController.java | 6 +- .../WorkloadHistoricalReportExcelView.java | 4 +- .../views/WorkloadSummaryReportExcelView.java | 4 +- .../JpaWorkloadSummaryReportViewFactory.java | 2 +- .../ipa/api/entities/AuditLogController.java | 6 +- .../ipa/api/entities/BudgetController.java | 5 +- .../entities/BudgetScenarioController.java | 4 +- .../ipa/api/entities/CourseController.java | 4 +- .../api/entities/ExpenseItemController.java | 4 +- .../entities/ExpenseItemTypeController.java | 2 +- .../api/entities/InstructorController.java | 4 +- .../entities/InstructorCostController.java | 4 +- .../entities/InstructorTypeController.java | 2 +- .../InstructorTypeCostController.java | 4 +- .../entities/LineItemCategoryController.java | 2 +- .../ipa/api/entities/LineItemController.java | 4 +- .../ScheduleInstructorNoteController.java | 4 +- .../ipa/api/entities/SectionController.java | 4 +- .../api/entities/SectionGroupController.java | 4 +- .../entities/SectionGroupCostController.java | 4 +- .../SectionGroupCostInstructorController.java | 4 +- .../TeachingAssignmentController.java | 4 +- .../dss/ipa/api/entities/UserController.java | 5 +- .../ipa/api/entities/UserRoleController.java | 4 +- .../entities/WorkloadSnapshotController.java | 6 +- .../dss/ipa/api/helpers/CurrentUser.java | 2 +- .../helpers/MultiReadHttpServletRequest.java | 14 ++-- .../api/helpers/MultiReadServletFilter.java | 16 ++-- .../edu/ucdavis/dss/ipa/config/JwtFilter.java | 21 ++++-- .../ucdavis/dss/ipa/entities/Activity.java | 28 +++---- .../ucdavis/dss/ipa/entities/ActivityLog.java | 16 ++-- .../dss/ipa/entities/ActivityLogTag.java | 8 +- .../dss/ipa/entities/ActivityType.java | 4 +- .../ucdavis/dss/ipa/entities/AuditLog.java | 4 +- .../ucdavis/dss/ipa/entities/BaseEntity.java | 2 +- .../edu/ucdavis/dss/ipa/entities/Budget.java | 4 +- .../dss/ipa/entities/BudgetScenario.java | 4 +- .../edu/ucdavis/dss/ipa/entities/Course.java | 9 +-- .../dss/ipa/entities/CourseComment.java | 4 +- .../ucdavis/dss/ipa/entities/ExpenseItem.java | 4 +- .../dss/ipa/entities/ExpenseItemType.java | 2 +- .../ucdavis/dss/ipa/entities/Instructor.java | 22 +++--- .../dss/ipa/entities/InstructorCost.java | 4 +- .../InstructorSupportCallResponse.java | 4 +- .../entities/InstructorSupportPreference.java | 4 +- .../dss/ipa/entities/InstructorType.java | 12 +-- .../dss/ipa/entities/InstructorTypeCost.java | 25 +++---- .../ucdavis/dss/ipa/entities/LineItem.java | 4 +- .../dss/ipa/entities/LineItemCategory.java | 2 +- .../dss/ipa/entities/LineItemComment.java | 4 +- .../dss/ipa/entities/LineItemType.java | 12 +-- .../ucdavis/dss/ipa/entities/Location.java | 2 +- .../edu/ucdavis/dss/ipa/entities/Notice.java | 4 +- .../dss/ipa/entities/ReasonCategory.java | 2 +- .../edu/ucdavis/dss/ipa/entities/Role.java | 14 ++-- .../ucdavis/dss/ipa/entities/Schedule.java | 9 +-- .../ipa/entities/ScheduleInstructorNote.java | 2 +- .../dss/ipa/entities/ScheduleTermState.java | 5 +- .../dss/ipa/entities/SchedulingNote.java | 22 +++--- .../edu/ucdavis/dss/ipa/entities/Section.java | 6 +- .../dss/ipa/entities/SectionGroup.java | 4 +- .../dss/ipa/entities/SectionGroupCost.java | 4 +- .../ipa/entities/SectionGroupCostComment.java | 5 +- .../entities/SectionGroupCostInstructor.java | 4 +- .../entities/StudentSupportCallResponse.java | 24 +++--- .../entities/StudentSupportPreference.java | 4 +- .../dss/ipa/entities/SupportAppointment.java | 20 ++--- .../dss/ipa/entities/SupportAssignment.java | 3 +- .../dss/ipa/entities/SupportStaff.java | 16 ++-- .../ucdavis/dss/ipa/entities/SyncAction.java | 3 +- .../edu/ucdavis/dss/ipa/entities/Tag.java | 4 +- .../dss/ipa/entities/TeachingAssignment.java | 2 +- .../dss/ipa/entities/TeachingCallComment.java | 4 +- .../dss/ipa/entities/TeachingCallReceipt.java | 4 +- .../ipa/entities/TeachingCallResponse.java | 28 ++++--- .../edu/ucdavis/dss/ipa/entities/Term.java | 12 +-- .../edu/ucdavis/dss/ipa/entities/User.java | 20 ++--- .../ucdavis/dss/ipa/entities/UserRole.java | 25 +++---- .../ucdavis/dss/ipa/entities/Workgroup.java | 6 +- .../dss/ipa/entities/WorkloadAssignment.java | 23 +++--- .../dss/ipa/entities/WorkloadSnapshot.java | 5 +- .../dss/ipa/entities/validation/Email.java | 8 +- .../dss/ipa/entities/validation/NotBlank.java | 8 +- .../validation/NotBlankValidator.java | 4 +- .../entities/validation/ValidActivity.java | 4 +- .../validation/ValidActivityValidator.java | 4 +- .../ipa/entities/validation/ValidSection.java | 4 +- .../validation/ValidSectionGroupCost.java | 4 +- .../ValidSectionGroupCostValidator.java | 4 +- .../validation/ValidSectionValidator.java | 4 +- .../ipa/exceptions/DwResponseException.java | 2 +- .../ipa/exceptions/ExpiredTokenException.java | 2 +- .../ipa/exceptions/RestExceptionHandler.java | 12 +-- .../handlers/AccessDeniedHandler.java | 6 +- .../handlers/AsyncExceptionHandler.java | 2 +- .../GlobalControllerExceptionHandler.java | 4 +- .../handlers/MvcExceptionHandler.java | 6 +- .../RestDataWarehouseRepository.java | 2 +- .../SectionGroupCostInstructorRepository.java | 2 +- .../dss/ipa/repositories/UserRepository.java | 5 +- .../AuthenticationFailureHandler.java | 6 +- .../dss/ipa/security/Authorization.java | 2 +- .../ucdavis/dss/ipa/security/Authorizer.java | 2 +- .../dss/ipa/security/CasEntryPoint.java | 9 +-- .../ipa/security/IpaPermissionEvaluator.java | 2 +- .../ipa/security/SecurityHeaderFilter.java | 11 ++- .../TokenAuthenticationEntryPoint.java | 6 +- .../security/TokenAuthenticationFilter.java | 8 +- .../security/TokenAuthenticationProvider.java | 2 +- ...SimpleUrlAuthenticationSuccessHandler.java | 6 +- .../dss/ipa/services/ActivityService.java | 6 +- .../dss/ipa/services/AuditLogService.java | 2 +- .../services/BudgetCalculationService.java | 2 +- .../dss/ipa/services/LocationService.java | 4 +- .../ucdavis/dss/ipa/services/RoleService.java | 4 +- .../dss/ipa/services/SectionService.java | 2 +- .../dss/ipa/services/SyncActionService.java | 5 +- .../ucdavis/dss/ipa/services/TagService.java | 4 +- .../services/TeachingAssignmentService.java | 4 +- .../services/TeachingCallReceiptService.java | 4 +- .../services/TeachingCallResponseService.java | 4 +- .../ucdavis/dss/ipa/services/TermService.java | 4 +- .../dss/ipa/services/UserRoleService.java | 4 +- .../ucdavis/dss/ipa/services/UserService.java | 6 +- .../dss/ipa/services/WorkgroupService.java | 5 +- .../services/jpa/JpaActivityLogService.java | 2 +- .../jpa/JpaActivityLogTagService.java | 2 - .../ipa/services/jpa/JpaActivityService.java | 4 +- .../ipa/services/jpa/JpaAuditLogService.java | 2 +- .../jpa/JpaAuthenticationService.java | 2 +- .../jpa/JpaBudgetScenarioService.java | 2 +- .../ipa/services/jpa/JpaBudgetService.java | 6 +- .../services/jpa/JpaCourseCommentService.java | 4 +- .../ipa/services/jpa/JpaCourseService.java | 2 +- .../services/jpa/JpaDataWarehouseService.java | 2 +- .../services/jpa/JpaExpenseItemService.java | 2 +- .../jpa/JpaExpenseItemTypeService.java | 2 +- .../jpa/JpaInstructorCostService.java | 2 +- .../services/jpa/JpaInstructorService.java | 2 +- ...aInstructorSupportCallResponseService.java | 4 +- ...JpaInstructorSupportPreferenceService.java | 2 +- .../jpa/JpaInstructorTypeCostService.java | 2 +- .../jpa/JpaInstructorTypeService.java | 2 +- .../jpa/JpaLineItemCategoryService.java | 5 +- .../jpa/JpaLineItemCommentService.java | 2 +- .../ipa/services/jpa/JpaLineItemService.java | 2 +- .../services/jpa/JpaLineItemTypeService.java | 2 +- .../ipa/services/jpa/JpaLocationService.java | 4 +- .../jpa/JpaReasonCategoryService.java | 2 +- .../dss/ipa/services/jpa/JpaRoleService.java | 9 +-- .../jpa/JpaScheduleInstructorNoteService.java | 2 +- .../services/jpa/JpaScheduleOpsService.java | 14 +--- .../ipa/services/jpa/JpaScheduleService.java | 4 +- .../jpa/JpaScheduleTermStateService.java | 2 +- .../jpa/JpaSchedulingNoteService.java | 3 +- .../JpaSectionGroupCostCommentService.java | 2 +- .../JpaSectionGroupCostInstructorService.java | 2 +- .../jpa/JpaSectionGroupCostService.java | 2 +- .../services/jpa/JpaSectionGroupService.java | 2 +- .../ipa/services/jpa/JpaSectionService.java | 6 +- .../JpaStudentSupportCallResponseService.java | 4 +- .../JpaStudentSupportPreferenceService.java | 3 +- .../jpa/JpaSupportAppointmentService.java | 2 +- .../jpa/JpaSupportAssignmentService.java | 2 +- .../services/jpa/JpaSupportStaffService.java | 2 +- .../services/jpa/JpaSyncActionService.java | 7 +- .../dss/ipa/services/jpa/JpaTagService.java | 4 +- .../jpa/JpaTeachingAssignmentService.java | 2 +- .../jpa/JpaTeachingCallCommentService.java | 2 +- .../jpa/JpaTeachingCallReceiptService.java | 4 +- .../jpa/JpaTeachingCallResponseService.java | 7 +- .../dss/ipa/services/jpa/JpaTermService.java | 4 +- .../ipa/services/jpa/JpaUserRoleService.java | 5 +- .../dss/ipa/services/jpa/JpaUserService.java | 2 +- .../ipa/services/jpa/JpaWorkgroupService.java | 9 +-- .../jpa/JpaWorkloadAssignmentService.java | 2 +- .../jpa/JpaWorkloadSnapshotService.java | 2 +- .../dss/ipa/tasks/EmailNotificationTask.java | 2 +- .../ucdavis/dss/ipa/tasks/TermUpdateTask.java | 3 +- .../dss/ipa/tasks/UpdateCourseTask.java | 3 +- .../dss/ipa/tasks/UpdateSectionsTask.java | 4 +- .../dss/ipa/tasks/UpdateTeachingCallTask.java | 2 +- .../dss/ipa/tasks/UpdateUsersTask.java | 2 +- .../ipa/utilities/DefaultEmailService.java | 5 +- .../dss/ipa/utilities/DeleteListener.java | 4 +- .../dss/ipa/utilities/ExcelHelper.java | 4 +- .../HibernateListenerConfigurer.java | 8 +- .../dss/ipa/utilities/InsertListener.java | 7 +- .../dss/ipa/utilities/UpdateListener.java | 4 +- src/main/resources/application.properties | 3 + 247 files changed, 626 insertions(+), 746 deletions(-) diff --git a/build.gradle b/build.gradle index 92c7b56be..472be3b58 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,11 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.7.17") - } +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.2' + id 'io.spring.dependency-management' version '1.1.4' + id 'checkstyle' + id 'idea' } -apply plugin: 'java' -apply plugin: 'org.springframework.boot' -apply plugin: 'io.spring.dependency-management' -apply plugin: 'checkstyle' -apply plugin: 'idea' - checkstyle { configFile file("checkstyle.xml") } @@ -36,47 +29,32 @@ test { } dependencies { - runtimeOnly("org.springframework.boot:spring-boot-properties-migrator") - implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.boot:spring-boot-starter-test") implementation("org.springframework.boot:spring-boot-starter-mail") implementation("org.springframework.boot:spring-boot-starter-validation") - implementation("org.springframework.ldap:spring-ldap-ldif-core:2.3.2.RELEASE") - implementation("io.jsonwebtoken:jjwt:0.9.0") - implementation("commons-io:commons-io:2.6") - implementation("org.springframework.security:spring-security-cas-client:3.0.8.RELEASE") - implementation("org.hibernate:hibernate-validator-annotation-processor:5.2.5.Final") - implementation("org.apache.poi:poi:3.17") - implementation("org.apache.poi:poi-ooxml:3.17") - implementation("javax.inject:javax.inject:1") - implementation("ch.qos.logback:logback-core:1.2.3") - implementation("ch.qos.logback:logback-classic:1.2.3") - implementation("org.slf4j:slf4j-api:1.7.25") - implementation("org.apache.commons:commons-lang3:3.7") - implementation("javax.mail:mail:1.4.7") - implementation("org.flywaydb:flyway-core:7.7.3") - implementation("org.apache.httpcomponents:httpclient:4.5.9") - implementation("org.javers:javers-core:2.4.1") - implementation("javax.xml.bind:jaxb-api:2.3.1") - implementation("com.amazonaws:aws-java-sdk-s3:1.12.187") - implementation("mysql:mysql-connector-java:8.0.33") - implementation("javax.annotation:javax.annotation-api:1.3.2") + implementation("org.springframework.ldap:spring-ldap-core:3.2.1") + implementation("org.springframework.security:spring-security-cas:6.2.1") + implementation("io.jsonwebtoken:jjwt-api:0.12.5") + runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.5") + runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.5") + implementation("commons-io:commons-io:2.15.1") + implementation("org.apache.poi:poi:5.2.5") + implementation("org.apache.poi:poi-ooxml:5.2.5") + implementation("jakarta.inject:jakarta.inject-api:2.0.1") + implementation("ch.qos.logback:logback-core:1.4.14") + implementation("ch.qos.logback:logback-classic:1.4.14") + implementation("org.slf4j:slf4j-api:2.0.11") + implementation("org.apache.commons:commons-lang3:3.14.0") + implementation("org.flywaydb:flyway-core:9.22.3") + implementation("org.flywaydb:flyway-mysql:9.22.3") + implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1") + implementation("org.javers:javers-core:7.3.7") + implementation("com.mysql:mysql-connector-j:8.3.0") + implementation("com.amazonaws:aws-java-sdk-s3:1.12.651") + testImplementation("junit:junit") testImplementation("com.h2database:h2:1.4.199") testImplementation("com.jayway.jsonpath:json-path:2.4.0") } - -task resolveDependencies { - doLast { - project.rootProject.allprojects.each { subProject -> - subProject.buildscript.configurations.each { configuration -> - resolveConfiguration(configuration) - } - subProject.configurations.each { configuration -> - resolveConfiguration(configuration) - } - } - } -} diff --git a/src/main/java/edu/ucdavis/dss/ipa/Application.java b/src/main/java/edu/ucdavis/dss/ipa/Application.java index bb57bd06c..5e888153f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/Application.java +++ b/src/main/java/edu/ucdavis/dss/ipa/Application.java @@ -4,8 +4,8 @@ import edu.ucdavis.dss.ipa.config.JwtFilter; import edu.ucdavis.dss.ipa.exceptions.handlers.MvcExceptionHandler; import edu.ucdavis.dss.ipa.security.SecurityHeaderFilter; -import org.jasig.cas.client.util.HttpServletRequestWrapperFilter; -import org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter; +import org.apereo.cas.client.util.HttpServletRequestWrapperFilter; +import org.apereo.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -16,7 +16,6 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver; @EnableScheduling @@ -119,7 +118,7 @@ public SimpleMappingExceptionResolver webExceptionResolver() { */ @Bean public WebMvcConfigurer corsConfigurer() { - return new WebMvcConfigurerAdapter() { + return new WebMvcConfigurer() { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**").allowedOrigins("http://localhost:9000", "https://test-ipa.dss.ucdavis.edu", "https://ipa.ucdavis.edu").allowCredentials(true).allowedMethods("*"); diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/activitylog/ActivityLogViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/activitylog/ActivityLogViewController.java index a06c368b3..fa4c5baea 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/activitylog/ActivityLogViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/activitylog/ActivityLogViewController.java @@ -7,7 +7,7 @@ import edu.ucdavis.dss.ipa.services.ActivityLogTagService; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/AdminViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/AdminViewController.java index 40186a041..512b99362 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/AdminViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/AdminViewController.java @@ -7,7 +7,7 @@ import edu.ucdavis.dss.ipa.services.WorkgroupService; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; @RestController public class AdminViewController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/views/factories/JpaAdminViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/views/factories/JpaAdminViewFactory.java index 6a3ea7c81..d9ef9661c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/views/factories/JpaAdminViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/admin/views/factories/JpaAdminViewFactory.java @@ -3,10 +3,9 @@ import edu.ucdavis.dss.ipa.api.components.admin.views.AdminView; import edu.ucdavis.dss.ipa.entities.*; import edu.ucdavis.dss.ipa.services.*; -import org.hibernate.jdbc.Work; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewController.java index 43956a973..466306b0e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewController.java @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.View; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.text.ParseException; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewCourseController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewCourseController.java index 8811961e7..ef4fa0c37 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewCourseController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewCourseController.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.entities.Course; import edu.ucdavis.dss.ipa.entities.CourseComment; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewScheduleInstructorNoteController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewScheduleInstructorNoteController.java index b1d8269df..15cc2cdd5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewScheduleInstructorNoteController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewScheduleInstructorNoteController.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Created by Lloyd on 8/10/16. diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewSectionGroupController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewSectionGroupController.java index afa25f4b0..108d71464 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewSectionGroupController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewSectionGroupController.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.entities.SectionGroup; import edu.ucdavis.dss.ipa.security.Authorizer; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingAssignmentController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingAssignmentController.java index 711b42d01..43ef2a25e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingAssignmentController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingAssignmentController.java @@ -10,8 +10,8 @@ import edu.ucdavis.dss.dw.dto.DwCourse; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; import java.util.Comparator; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallReceiptController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallReceiptController.java index d5b0a7e52..3dec149fe 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallReceiptController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallReceiptController.java @@ -10,8 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; /** * Created by Lloyd on 8/10/16. diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallResponseController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallResponseController.java index 2c8bc5ced..369c3ad43 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallResponseController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/AssignmentViewTeachingCallResponseController.java @@ -7,8 +7,8 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; /** * Created by Lloyd on 8/10/16. diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/AssignmentExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/AssignmentExcelView.java index ff3d64ff6..6e3225ded 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/AssignmentExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/AssignmentExcelView.java @@ -15,8 +15,8 @@ import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/factories/JpaAssignmentViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/factories/JpaAssignmentViewFactory.java index a8edb6915..a7877d79e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/factories/JpaAssignmentViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/assignment/views/factories/JpaAssignmentViewFactory.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.servlet.View; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/auditLog/views/AuditLogExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/auditLog/views/AuditLogExcelView.java index c63967b70..8665a78dc 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/auditLog/views/AuditLogExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/auditLog/views/AuditLogExcelView.java @@ -8,8 +8,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsxView; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/auth/AuthController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/auth/AuthController.java index dbe2521cc..9111a5e4e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/auth/AuthController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/auth/AuthController.java @@ -2,11 +2,10 @@ import java.util.*; -import javax.inject.Inject; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import edu.ucdavis.dss.ipa.entities.ScheduleTermState; import edu.ucdavis.dss.ipa.entities.User; @@ -15,6 +14,10 @@ import edu.ucdavis.dss.ipa.services.UserRoleService; import edu.ucdavis.dss.ipa.services.UserService; import io.jsonwebtoken.*; +import io.jsonwebtoken.security.SignatureException; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import javax.crypto.SecretKey; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -64,8 +67,8 @@ public SecurityDTO validate(@RequestBody SecurityDTO securityDTO, HttpServletReq // Check if the token exists, else check for CAS if (securityDTO.token != null) { try { - Claims claims = Jwts.parser().setSigningKey(jwtSigningKey) - .parseClaimsJws(securityDTO.token).getBody(); + Claims claims = Jwts.parser().verifyWith(getSecretKey()).build() + .parseSignedClaims(securityDTO.token).getPayload(); // Ensure token is not expired before we refresh it Date now = new Date(); @@ -116,12 +119,12 @@ public SecurityDTO validate(@RequestBody SecurityDTO securityDTO, HttpServletReq // Update the user lastAccessed value userService.updateLastAccessed(user); - securityDTO.token = Jwts.builder().setSubject(loginId) + securityDTO.token = Jwts.builder().subject(loginId) .claim("loginId", loginId) .claim("realUserLoginId", realUserLoginId) .claim("expirationDate", expirationDate) - .setIssuedAt(new Date()) - .signWith(SignatureAlgorithm.HS256, jwtSigningKey).compact(); + .issuedAt(new Date()) + .signWith(getSecretKey()).compact(); securityDTO.setLoginId(loginId); securityDTO.setRealUserLoginId(realUserLoginId); securityDTO.setUserRoles(userRoles); @@ -193,8 +196,8 @@ public SecurityDTO impersonate(@PathVariable String loginIdToImpersonate, @Reque Date expirationDate = calendarNow.getTime(); try { - Claims claims = Jwts.parser().setSigningKey(jwtSigningKey) - .parseClaimsJws(securityDTO.token).getBody(); + Claims claims = Jwts.parser().verifyWith(getSecretKey()).build() + .parseSignedClaims(securityDTO.token).getPayload(); // Deserialize tokens String realUserLoginId = (String) claims.get("realUserLoginId"); @@ -231,13 +234,13 @@ public SecurityDTO impersonate(@PathVariable String loginIdToImpersonate, @Reque List termStates = scheduleTermStateService.getScheduleTermStatesByLoginId(loginIdToImpersonate); // Rebuild token - securityDTO.token = Jwts.builder().setSubject(loginIdToImpersonate) + securityDTO.token = Jwts.builder().subject(loginIdToImpersonate) .claim("userRoles", userRoles) .claim("loginId", loginIdToImpersonate) .claim("realUserLoginId", realUserLoginId) .claim("expirationDate", expirationDate) - .setIssuedAt(new Date()) - .signWith(SignatureAlgorithm.HS256, jwtSigningKey).compact(); + .issuedAt(new Date()) + .signWith(getSecretKey()).compact(); securityDTO.setLoginId(loginIdToImpersonate); securityDTO.setRealUserLoginId(realUserLoginId); securityDTO.setUserRoles(userRoles); @@ -272,8 +275,8 @@ public SecurityDTO unimpersonate(@RequestBody SecurityDTO securityDTO, Date expirationDate = calendarNow.getTime(); try { - Claims claims = Jwts.parser().setSigningKey(jwtSigningKey) - .parseClaimsJws(securityDTO.token).getBody(); + Claims claims = Jwts.parser().verifyWith(getSecretKey()).build() + .parseSignedClaims(securityDTO.token).getPayload(); // Deserialize token String realUserLoginId = (String) claims.get("realUserLoginId"); @@ -284,13 +287,13 @@ public SecurityDTO unimpersonate(@RequestBody SecurityDTO securityDTO, User realUser = userService.getOneByLoginId(realUserLoginId); // Rebuild token - securityDTO.token = Jwts.builder().setSubject(realUserLoginId) + securityDTO.token = Jwts.builder().subject(realUserLoginId) .claim("userRoles", userRoles) .claim("loginId", realUserLoginId) .claim("realUserLoginId", realUserLoginId) .claim("expirationDate", expirationDate) - .setIssuedAt(new Date()) - .signWith(SignatureAlgorithm.HS256, jwtSigningKey).compact(); + .issuedAt(new Date()) + .signWith(getSecretKey()).compact(); securityDTO.setLoginId(realUserLoginId); securityDTO.setRealUserLoginId(realUserLoginId); securityDTO.setUserRoles(userRoles); @@ -306,4 +309,8 @@ public SecurityDTO unimpersonate(@RequestBody SecurityDTO securityDTO, return securityDTO; } + + private SecretKey getSecretKey() { + return Keys.hmacShaKeyFor(Decoders.BASE64.decode(jwtSigningKey)); + } } \ No newline at end of file diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/BudgetViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/BudgetViewController.java index cfd67ee31..d64011ec3 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/BudgetViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/BudgetViewController.java @@ -3,28 +3,23 @@ import edu.ucdavis.dss.ipa.api.components.budget.views.BudgetComparisonExcelView; import edu.ucdavis.dss.ipa.api.components.budget.views.BudgetScenarioView; import edu.ucdavis.dss.ipa.api.components.budget.views.BudgetView; -import edu.ucdavis.dss.ipa.api.components.budget.views.WorkgroupIdBudgetScenarioId; import edu.ucdavis.dss.ipa.api.components.budget.views.factories.BudgetViewFactory; import edu.ucdavis.dss.ipa.entities.*; import edu.ucdavis.dss.ipa.security.Authorizer; -import edu.ucdavis.dss.ipa.security.UrlEncryptor; import edu.ucdavis.dss.ipa.services.*; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.servlet.View; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.text.ParseException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RestController public class BudgetViewController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetComparisonExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetComparisonExcelView.java index 4b962fda6..c5d3def74 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetComparisonExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetComparisonExcelView.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.IgnoredErrorType; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetExcelView.java index eee998d3d..84d767e17 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/BudgetExcelView.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.IgnoredErrorType; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/factories/JpaBudgetViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/factories/JpaBudgetViewFactory.java index b28943c98..698abfbd9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/factories/JpaBudgetViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/budget/views/factories/JpaBudgetViewFactory.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/course/CourseViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/course/CourseViewController.java index ead53c890..cab8165cb 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/course/CourseViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/course/CourseViewController.java @@ -30,11 +30,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import java.sql.Time; import java.text.ParseException; import java.util.*; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/CourseExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/CourseExcelView.java index bf5651740..088d7a1c4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/CourseExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/CourseExcelView.java @@ -7,8 +7,8 @@ import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; import java.util.function.Predicate; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/factories/JpaAnnualViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/factories/JpaAnnualViewFactory.java index 592e8bdc8..66c07af7f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/factories/JpaAnnualViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/course/views/factories/JpaAnnualViewFactory.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.servlet.View; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportAssignmentsController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportAssignmentsController.java index b6cb1c220..64b14e5db 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportAssignmentsController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportAssignmentsController.java @@ -9,15 +9,15 @@ import java.text.ParseException; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.View; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; @RestController public class InstructionalSupportAssignmentsController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportCallsController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportCallsController.java index 309b6fe3c..b5288be63 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportCallsController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportCallsController.java @@ -10,13 +10,11 @@ import edu.ucdavis.dss.ipa.api.components.instructionalSupport.views.InstructionalSupportCallStatusView; import edu.ucdavis.dss.ipa.api.components.instructionalSupport.views.factories.InstructionalSupportViewFactory; import edu.ucdavis.dss.ipa.entities.*; -import edu.ucdavis.dss.ipa.security.Authorization; import edu.ucdavis.dss.ipa.security.Authorizer; import edu.ucdavis.dss.ipa.services.*; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportInstructorFormsController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportInstructorFormsController.java index a06c3d11c..d8e4db50a 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportInstructorFormsController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportInstructorFormsController.java @@ -8,7 +8,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportStudentFormsController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportStudentFormsController.java index b7dab4330..8ac8b55cc 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportStudentFormsController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/InstructionalSupportStudentFormsController.java @@ -9,8 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/InstructionalSupportExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/InstructionalSupportExcelView.java index 06b6ea561..fa10cd607 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/InstructionalSupportExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/InstructionalSupportExcelView.java @@ -9,8 +9,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsxView; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/factories/JpaInstructionalSupportViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/factories/JpaInstructionalSupportViewFactory.java index 3a875440e..a805f62da 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/factories/JpaInstructionalSupportViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/instructionalSupport/views/factories/JpaInstructionalSupportViewFactory.java @@ -43,7 +43,7 @@ import edu.ucdavis.dss.ipa.services.WorkgroupService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/RegistrarReconciliationReportController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/RegistrarReconciliationReportController.java index e1ca6ffa9..153ef6ab5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/RegistrarReconciliationReportController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/RegistrarReconciliationReportController.java @@ -1,7 +1,5 @@ package edu.ucdavis.dss.ipa.api.components.registrarReconciliationReport; -import static edu.ucdavis.dss.ipa.api.helpers.Utilities.isNumeric; - import com.fasterxml.jackson.databind.JsonNode; import edu.ucdavis.dss.dw.dto.DwCourse; import edu.ucdavis.dss.ipa.api.components.registrarReconciliationReport.views.SectionDiffView; @@ -37,16 +35,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/ActivityDiffDto.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/ActivityDiffDto.java index 409e90ed0..7814ffd9d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/ActivityDiffDto.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/ActivityDiffDto.java @@ -3,7 +3,7 @@ import org.javers.core.metamodel.annotation.DiffIgnore; -import javax.persistence.Id; +import jakarta.persistence.Id; public class ActivityDiffDto { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/InstructorDiffDto.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/InstructorDiffDto.java index 1efcf8b9c..8d64686e8 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/InstructorDiffDto.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/InstructorDiffDto.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.api.components.registrarReconciliationReport.views; -import javax.persistence.Id; +import jakarta.persistence.Id; public class InstructorDiffDto { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/SectionDiffDto.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/SectionDiffDto.java index ab78177a6..de9a7b8c0 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/SectionDiffDto.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/SectionDiffDto.java @@ -3,7 +3,7 @@ import org.javers.core.metamodel.annotation.DiffIgnore; -import javax.persistence.Id; +import jakarta.persistence.Id; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/factories/JpaReportViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/factories/JpaReportViewFactory.java index ccd3ff0fb..ed928f084 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/factories/JpaReportViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/registrarReconciliationReport/views/factories/JpaReportViewFactory.java @@ -21,7 +21,6 @@ import edu.ucdavis.dss.ipa.services.SyncActionService; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; @@ -30,7 +29,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.javers.core.Javers; import org.javers.core.JaversBuilder; import org.javers.core.diff.Diff; @@ -53,6 +52,7 @@ public class JpaReportViewFactory implements ReportViewFactory { public List createDiffView(long workgroupId, long year, String termCode) { Javers javers = JaversBuilder .javers() + .withInitialChanges(false) .withListCompareAlgorithm(ListCompareAlgorithm.LEVENSHTEIN_DISTANCE) .build(); List diffView = new ArrayList<>(); diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/ScheduleSummaryReportController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/ScheduleSummaryReportController.java index ad34c3e44..06978c75e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/ScheduleSummaryReportController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/ScheduleSummaryReportController.java @@ -7,9 +7,9 @@ import java.text.ParseException; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportAnnualExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportAnnualExcelView.java index 9bc643622..c2b2e92ab 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportAnnualExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportAnnualExcelView.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsxView; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportExcelView.java index e827bbfd3..8af05c8e3 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/ScheduleSummaryReportExcelView.java @@ -12,8 +12,8 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collections; import java.util.Comparator; import java.util.Date; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/factories/JpaScheduleSummaryViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/factories/JpaScheduleSummaryViewFactory.java index a07c9c338..77673a209 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/factories/JpaScheduleSummaryViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduleSummaryReport/views/factories/JpaScheduleSummaryViewFactory.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.servlet.View; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/SchedulingViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/SchedulingViewController.java index 27bdd7580..bf3d06e93 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/SchedulingViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/SchedulingViewController.java @@ -13,8 +13,8 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/views/factories/JpaSchedulingViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/views/factories/JpaSchedulingViewFactory.java index 48cff006b..98a2cbd87 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/views/factories/JpaSchedulingViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/scheduling/views/factories/JpaSchedulingViewFactory.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/site/SiteController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/site/SiteController.java index 4acdc532e..a6bb39534 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/site/SiteController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/site/SiteController.java @@ -9,9 +9,9 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.mail.MessagingException; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.mail.MessagingException; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/SummaryViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/SummaryViewController.java index 27d8a3353..09b19acaa 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/SummaryViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/SummaryViewController.java @@ -10,7 +10,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; @RestController public class SummaryViewController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/views/factories/JpaSummaryViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/views/factories/JpaSummaryViewFactory.java index 2937373b6..a9581317b 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/views/factories/JpaSummaryViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/summary/views/factories/JpaSummaryViewFactory.java @@ -5,9 +5,8 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; -import java.util.Calendar; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/SupportCallResponseReportController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/SupportCallResponseReportController.java index e117a8f32..d1cfc6556 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/SupportCallResponseReportController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/SupportCallResponseReportController.java @@ -7,9 +7,9 @@ import java.text.ParseException; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/SupportCallResponseReportExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/SupportCallResponseReportExcelView.java index 1d1f574e7..78eadfa36 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/SupportCallResponseReportExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/SupportCallResponseReportExcelView.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsxView; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/factories/JpaSupportCallResponseReportViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/factories/JpaSupportCallResponseReportViewFactory.java index cbb437ce7..f03dd9293 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/factories/JpaSupportCallResponseReportViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/supportCallResponseReport/views/factories/JpaSupportCallResponseReportViewFactory.java @@ -9,7 +9,6 @@ import edu.ucdavis.dss.ipa.entities.StudentSupportPreference; import edu.ucdavis.dss.ipa.entities.SupportStaff; import edu.ucdavis.dss.ipa.entities.Term; -import edu.ucdavis.dss.ipa.entities.enums.TermDescription; import edu.ucdavis.dss.ipa.services.ScheduleService; import edu.ucdavis.dss.ipa.services.SectionGroupService; import edu.ucdavis.dss.ipa.services.StudentSupportCallResponseService; @@ -18,8 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; import org.springframework.web.servlet.View; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallFormViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallFormViewController.java index 5ed702a28..563827afb 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallFormViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallFormViewController.java @@ -9,7 +9,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; @RestController public class TeachingCallFormViewController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallStatusViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallStatusViewController.java index 46f745d73..c90c53c8d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallStatusViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/TeachingCallStatusViewController.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/views/factories/JpaTeachingCallViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/views/factories/JpaTeachingCallViewFactory.java index 36324b96d..a6ea41582 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/views/factories/JpaTeachingCallViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCall/views/factories/JpaTeachingCallViewFactory.java @@ -6,7 +6,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/TeachingCallResponseReportController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/TeachingCallResponseReportController.java index 738cd6691..e780f6d51 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/TeachingCallResponseReportController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/TeachingCallResponseReportController.java @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.View; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.text.ParseException; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/TeachingCallResponseReportExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/TeachingCallResponseReportExcelView.java index fefdcf380..120c71450 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/TeachingCallResponseReportExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/TeachingCallResponseReportExcelView.java @@ -1,15 +1,12 @@ package edu.ucdavis.dss.ipa.api.components.teachingCallResponseReport.views; -import edu.ucdavis.dss.ipa.api.components.course.views.CourseView; import edu.ucdavis.dss.ipa.entities.*; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.*; import org.springframework.web.servlet.view.document.AbstractXlsView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.*; -import java.util.function.Predicate; import java.util.stream.Collectors; public class TeachingCallResponseReportExcelView extends AbstractXlsView { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/factories/JpaTeachingCallResponseReportViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/factories/JpaTeachingCallResponseReportViewFactory.java index 9a1c92fee..cb2eab412 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/factories/JpaTeachingCallResponseReportViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/teachingCallResponseReport/views/factories/JpaTeachingCallResponseReportViewFactory.java @@ -15,7 +15,7 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; import org.springframework.web.servlet.View; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewController.java index 804b1172b..7f14f155d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewController.java @@ -5,8 +5,8 @@ import edu.ucdavis.dss.ipa.security.Authorizer; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; @RestController public class WorkgroupViewController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewLocationController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewLocationController.java index 8b39bfd2a..0e1cffbb9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewLocationController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewLocationController.java @@ -7,7 +7,7 @@ import edu.ucdavis.dss.ipa.services.WorkgroupService; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; @RestController public class WorkgroupViewLocationController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewTagController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewTagController.java index 79ec3f79e..7e4a5af86 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewTagController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewTagController.java @@ -7,7 +7,7 @@ import edu.ucdavis.dss.ipa.services.WorkgroupService; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; +import jakarta.inject.Inject; @RestController public class WorkgroupViewTagController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewUserController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewUserController.java index 4b7d9ecc4..d6b3a2569 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewUserController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/WorkgroupViewUserController.java @@ -21,8 +21,8 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/views/factories/JpaWorkgroupViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/views/factories/JpaWorkgroupViewFactory.java index 7507e209a..e781801c9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/views/factories/JpaWorkgroupViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workgroup/views/factories/JpaWorkgroupViewFactory.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/WorkloadSummaryReportController.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/WorkloadSummaryReportController.java index 04c75f352..213f3ff1d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/WorkloadSummaryReportController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/WorkloadSummaryReportController.java @@ -23,9 +23,9 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadHistoricalReportExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadHistoricalReportExcelView.java index 32ed5f2a1..deb14e46b 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadHistoricalReportExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadHistoricalReportExcelView.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.web.servlet.view.document.AbstractXlsxView; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadSummaryReportExcelView.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadSummaryReportExcelView.java index edf3ecf3a..3541489b5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadSummaryReportExcelView.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/WorkloadSummaryReportExcelView.java @@ -14,8 +14,8 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/factories/JpaWorkloadSummaryReportViewFactory.java b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/factories/JpaWorkloadSummaryReportViewFactory.java index 860bde2c3..60ad82612 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/factories/JpaWorkloadSummaryReportViewFactory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/components/workloadSummaryReport/views/factories/JpaWorkloadSummaryReportViewFactory.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/AuditLogController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/AuditLogController.java index 47fa62b69..d30de64eb 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/AuditLogController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/AuditLogController.java @@ -7,9 +7,9 @@ import edu.ucdavis.dss.ipa.services.AuditLogService; import edu.ucdavis.dss.ipa.services.WorkgroupService; import java.util.List; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetController.java index 38b3b60eb..797ff97c2 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetController.java @@ -10,9 +10,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; -import java.util.List; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; @RestController public class BudgetController { diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetScenarioController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetScenarioController.java index f7dbbb94a..dce95f3f8 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetScenarioController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/BudgetScenarioController.java @@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/CourseController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/CourseController.java index 9a2d58d86..95b05fa0d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/CourseController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/CourseController.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemController.java index 5e7d60c9b..dd96bf00f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemTypeController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemTypeController.java index d0c342781..d30992149 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemTypeController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/ExpenseItemTypeController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorController.java index 9c75a98be..0351c4d77 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorCostController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorCostController.java index ea8049b3c..30d838944 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorCostController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorCostController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeController.java index 13ad484f7..02eb04ec9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeCostController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeCostController.java index 5b1d9b57d..880d4f03c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeCostController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/InstructorTypeCostController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemCategoryController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemCategoryController.java index 0e8fca05f..e12074839 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemCategoryController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemCategoryController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemController.java index 75052dc8b..36c087a99 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/LineItemController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/ScheduleInstructorNoteController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/ScheduleInstructorNoteController.java index 398fbf31f..7cb129a41 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/ScheduleInstructorNoteController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/ScheduleInstructorNoteController.java @@ -6,8 +6,8 @@ import edu.ucdavis.dss.ipa.services.ScheduleInstructorNoteService; import edu.ucdavis.dss.ipa.services.ScheduleService; import java.util.List; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionController.java index b6fbb6aeb..37aadc886 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupController.java index 2dbdbc009..ba4ed509f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupController.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostController.java index e3ae5db34..87861f4bc 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostInstructorController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostInstructorController.java index a80aacdd0..649fe2d92 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostInstructorController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/SectionGroupCostInstructorController.java @@ -8,8 +8,8 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/TeachingAssignmentController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/TeachingAssignmentController.java index a7333cd7f..105dea9e0 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/TeachingAssignmentController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/TeachingAssignmentController.java @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserController.java index ccaaf4685..29c2ef305 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserController.java @@ -14,10 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashSet; -import java.util.List; import java.util.Set; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserRoleController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserRoleController.java index ff307eb4b..2e19d6a57 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserRoleController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/UserRoleController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; @RestController diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/entities/WorkloadSnapshotController.java b/src/main/java/edu/ucdavis/dss/ipa/api/entities/WorkloadSnapshotController.java index 84af5ce50..0fd8feb29 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/entities/WorkloadSnapshotController.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/entities/WorkloadSnapshotController.java @@ -13,9 +13,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.http.HttpStatus; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/helpers/CurrentUser.java b/src/main/java/edu/ucdavis/dss/ipa/api/helpers/CurrentUser.java index 2cd3e1f5f..368ad4a8d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/helpers/CurrentUser.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/helpers/CurrentUser.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadHttpServletRequest.java b/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadHttpServletRequest.java index 60e513b1c..3f20e7ac6 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadHttpServletRequest.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadHttpServletRequest.java @@ -1,15 +1,13 @@ package edu.ucdavis.dss.ipa.api.helpers; import java.io.*; -import java.util.Collection; -import javax.servlet.ReadListener; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.Part; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; /** * Needed by the MvcExceptionHandler to read JSON requests to log the body for diff --git a/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadServletFilter.java b/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadServletFilter.java index 1f29cdb47..16058cad4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadServletFilter.java +++ b/src/main/java/edu/ucdavis/dss/ipa/api/helpers/MultiReadServletFilter.java @@ -1,15 +1,11 @@ package edu.ucdavis.dss.ipa.api.helpers; -import org.springframework.web.filter.GenericFilterBean; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * This filter runs the request through the MultiReadHttpServletRequest which allows multiple reads diff --git a/src/main/java/edu/ucdavis/dss/ipa/config/JwtFilter.java b/src/main/java/edu/ucdavis/dss/ipa/config/JwtFilter.java index 1c0dec07c..eefaa53b4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/config/JwtFilter.java +++ b/src/main/java/edu/ucdavis/dss/ipa/config/JwtFilter.java @@ -1,21 +1,22 @@ package edu.ucdavis.dss.ipa.config; -import edu.ucdavis.dss.ipa.entities.UserRole; import edu.ucdavis.dss.ipa.security.Authorization; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.MalformedJwtException; -import io.jsonwebtoken.SignatureException; +import io.jsonwebtoken.security.SignatureException; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import javax.crypto.SecretKey; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.filter.GenericFilterBean; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Date; -import java.util.List; import java.util.stream.Collectors; public class JwtFilter extends GenericFilterBean { @@ -43,8 +44,8 @@ public void doFilter(final ServletRequest req, final String token = authHeader.substring(7); // The part after "Bearer " try { - final Claims claims = Jwts.parser().setSigningKey(jwtSigningKey) - .parseClaimsJws(token).getBody(); + final Claims claims = Jwts.parser().verifyWith(getSecretKey()).build() + .parseSignedClaims(token).getPayload(); authorization.setLoginId((String) claims.get("loginId")); authorization.setRealUserLoginId((String) claims.get("realUserLoginId")); @@ -93,4 +94,8 @@ public void doFilter(final ServletRequest req, public void setJwtSigningKey(String jwtSigningKey) { this.jwtSigningKey = jwtSigningKey; } + + private SecretKey getSecretKey() { + return Keys.hmacShaKeyFor(Decoders.BASE64.decode(this.jwtSigningKey)); + } } diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Activity.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Activity.java index 5a064905e..4d93ac2e4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Activity.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Activity.java @@ -11,20 +11,20 @@ import java.sql.Time; import java.time.format.DateTimeFormatter; import java.util.Date; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; @JsonIgnoreProperties(ignoreUnknown = true) @SuppressWarnings("serial") diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLog.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLog.java index e53906e26..eba11bbe6 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLog.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLog.java @@ -7,14 +7,14 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; - -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; + +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLogTag.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLogTag.java index 8d6290f02..9e6cb1207 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLogTag.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityLogTag.java @@ -2,12 +2,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.*; +import jakarta.persistence.*; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; //@Entity public class ActivityLogTag { diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityType.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityType.java index 93def9583..6a1134686 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityType.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ActivityType.java @@ -1,13 +1,11 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import org.springframework.data.annotation.Transient; import com.fasterxml.jackson.annotation.JsonIgnore; -import edu.ucdavis.dss.ipa.api.views.SectionGroupViews; - /** * Information provided by the UCD Registrar. * Modeled after DW implementation diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/AuditLog.java b/src/main/java/edu/ucdavis/dss/ipa/entities/AuditLog.java index d91e2347a..f5003b7cc 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/AuditLog.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/AuditLog.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.Date; import java.util.UUID; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/BaseEntity.java b/src/main/java/edu/ucdavis/dss/ipa/entities/BaseEntity.java index 34e96e623..7832bd25e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/BaseEntity.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/BaseEntity.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.context.request.RequestContextHolder; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Budget.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Budget.java index b23e12b6f..d8471a6c9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Budget.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Budget.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/BudgetScenario.java b/src/main/java/edu/ucdavis/dss/ipa/entities/BudgetScenario.java index 83b3ef5f5..779b61948 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/BudgetScenario.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/BudgetScenario.java @@ -4,8 +4,8 @@ import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Course.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Course.java index 1871292c0..6b1fb1cc3 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Course.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Course.java @@ -6,9 +6,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.CourseDeserializer; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import java.io.Serializable; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -69,9 +68,9 @@ public void setSchedule(Schedule schedule) { @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinTable(name = "Courses_has_Tags", joinColumns = { - @JoinColumn(name = "CourseId", nullable = false, updatable = false) }, + @JoinColumn(name = "CourseId", nullable = false, updatable = false, insertable = false) }, inverseJoinColumns = { @JoinColumn(name = "TagId", - nullable = false, updatable = false) }) + nullable = false, updatable = false, insertable = false) }) @JsonIgnore @JsonDeserialize public List getTags() { diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/CourseComment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/CourseComment.java index 63f146838..f5b7cce15 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/CourseComment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/CourseComment.java @@ -1,8 +1,8 @@ package edu.ucdavis.dss.ipa.entities; import java.util.Date; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItem.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItem.java index e3d686f4b..733164107 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItem.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItem.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.ExpenseItemDeserializer; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; @Entity diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItemType.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItemType.java index 34ffc1cf5..f45bf25ea 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItemType.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ExpenseItemType.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "ExpenseItemTypes") diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Instructor.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Instructor.java index ca3b62224..2844b9b38 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Instructor.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Instructor.java @@ -4,17 +4,17 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorCost.java b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorCost.java index 7d57d678a..5ae15facf 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorCost.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorCost.java @@ -2,8 +2,8 @@ import java.math.BigDecimal; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportCallResponse.java b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportCallResponse.java index 9bd26255d..43b3c063e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportCallResponse.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportCallResponse.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportPreference.java b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportPreference.java index e9e8bd525..1a6881638 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportPreference.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorSupportPreference.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorType.java b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorType.java index eabb03811..44bd2a31c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorType.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorType.java @@ -1,11 +1,11 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorTypeCost.java b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorTypeCost.java index cbd730405..0b3f3f7d8 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorTypeCost.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/InstructorTypeCost.java @@ -1,18 +1,17 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItem.java b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItem.java index 3b454713f..96762b4b6 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItem.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItem.java @@ -5,8 +5,8 @@ import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemCategory.java b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemCategory.java index a72792c5a..87916187a 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemCategory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemCategory.java @@ -1,6 +1,6 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.*; +import jakarta.persistence.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemComment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemComment.java index 9ab15ee0d..a35dc638b 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemComment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemComment.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemType.java b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemType.java index e2ddb0fdd..ab8bdd7fc 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemType.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/LineItemType.java @@ -2,12 +2,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "LineItemTypes") diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Location.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Location.java index 18e306d63..850ff15b8 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Location.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Location.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Notice.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Notice.java index c2850c019..527cf6d31 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Notice.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Notice.java @@ -3,10 +3,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; @SuppressWarnings("serial") @Entity diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ReasonCategory.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ReasonCategory.java index 2371ada2d..11bd5efe5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ReasonCategory.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ReasonCategory.java @@ -1,6 +1,6 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.*; +import jakarta.persistence.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Role.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Role.java index 15128d183..0cbea2035 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Role.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Role.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Schedule.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Schedule.java index 2ce9e9699..ea05eba6f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Schedule.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Schedule.java @@ -3,12 +3,10 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Calendar; -import java.util.HashSet; import java.util.List; -import java.util.Set; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -97,9 +95,6 @@ public Workgroup getWorkgroup() { public void setWorkgroup(Workgroup workgroup) { this.workgroup = workgroup; - if (!workgroup.getSchedules().contains(this)) { - workgroup.getSchedules().add(this); - } } public String getSecretToken() { diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleInstructorNote.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleInstructorNote.java index 74895313e..ba30fbe66 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleInstructorNote.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleInstructorNote.java @@ -1,6 +1,6 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.*; +import jakarta.persistence.*; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleTermState.java b/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleTermState.java index bd9a4c357..6ef6eca68 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleTermState.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/ScheduleTermState.java @@ -1,14 +1,11 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.Transient; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonView; import edu.ucdavis.dss.ipa.entities.enums.TermState; -import edu.ucdavis.dss.ipa.api.views.ScheduleViews; -import edu.ucdavis.dss.ipa.api.views.WorkgroupViews; @JsonIgnoreProperties(ignoreUnknown = true) public class ScheduleTermState { diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SchedulingNote.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SchedulingNote.java index b594a45b0..70e4078f9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SchedulingNote.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SchedulingNote.java @@ -4,17 +4,17 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; @Entity @Table(name = "SchedulingNotes") diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Section.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Section.java index ab839b1cf..3801fbc37 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Section.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Section.java @@ -5,11 +5,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.SectionDeserializer; -import edu.ucdavis.dss.ipa.entities.validation.ValidSection; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import java.io.Serializable; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroup.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroup.java index f19d16b5b..b64dc7e14 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroup.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroup.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.SectionGroupDeserializer; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCost.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCost.java index 8b702defb..8158d9681 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCost.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCost.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostComment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostComment.java index 0b3343b33..54773b0c9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostComment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostComment.java @@ -1,14 +1,13 @@ package edu.ucdavis.dss.ipa.entities; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.SectionGroupCostCommentDeserializer; -import edu.ucdavis.dss.ipa.api.deserializers.SectionGroupCostDeserializer; import java.util.Date; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostInstructor.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostInstructor.java index 0537512d8..cfe95d5d0 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostInstructor.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SectionGroupCostInstructor.java @@ -1,8 +1,8 @@ package edu.ucdavis.dss.ipa.entities; import java.math.BigDecimal; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIdentityReference; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportCallResponse.java b/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportCallResponse.java index 1f9c27c85..cb34e846a 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportCallResponse.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportCallResponse.java @@ -6,18 +6,18 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; @SuppressWarnings("serial") @Entity diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportPreference.java b/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportPreference.java index 8025e164c..e13146be3 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportPreference.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/StudentSupportPreference.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAppointment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAppointment.java index c341a4dbe..5ff6544ff 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAppointment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAppointment.java @@ -6,16 +6,16 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.SupportAppointmentDeserializer; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.io.Serializable; @SuppressWarnings("serial") diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAssignment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAssignment.java index df0bbbbe2..bfeca5d41 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAssignment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SupportAssignment.java @@ -3,8 +3,7 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SupportStaff.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SupportStaff.java index 566eadf1c..b537ce8fd 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SupportStaff.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SupportStaff.java @@ -2,14 +2,14 @@ import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/SyncAction.java b/src/main/java/edu/ucdavis/dss/ipa/entities/SyncAction.java index 2e9aad0bb..1bc786c9e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/SyncAction.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/SyncAction.java @@ -6,8 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.SyncActionDeserializer; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; /** * Decisions made by the user to apply to Banner in the DiffView diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Tag.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Tag.java index bc37f5f0c..bde0bee42 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Tag.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Tag.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingAssignment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingAssignment.java index 770abb8c1..183a0e8d9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingAssignment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingAssignment.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.TeachingAssignmentDeserializer; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallComment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallComment.java index 09037ec8f..c5d8cbb3b 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallComment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallComment.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.Date; @Entity diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallReceipt.java b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallReceipt.java index a76b001d7..c9cdae222 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallReceipt.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallReceipt.java @@ -5,8 +5,8 @@ import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallResponse.java b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallResponse.java index 7750e038d..00adf9567 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallResponse.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/TeachingCallResponse.java @@ -2,27 +2,25 @@ import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.TeachingCallResponseDeserializer; -import edu.ucdavis.dss.ipa.api.views.TeachingCallResponseViews; /** * @author okadri diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Term.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Term.java index c83190ef7..7cf3692be 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Term.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Term.java @@ -9,12 +9,12 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/User.java b/src/main/java/edu/ucdavis/dss/ipa/entities/User.java index 002684145..d8c652ae4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/User.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/User.java @@ -4,16 +4,16 @@ import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/UserRole.java b/src/main/java/edu/ucdavis/dss/ipa/entities/UserRole.java index 908649ca3..49633fa49 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/UserRole.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/UserRole.java @@ -1,19 +1,16 @@ package edu.ucdavis.dss.ipa.entities; -import java.io.Serializable; - -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/Workgroup.java b/src/main/java/edu/ucdavis/dss/ipa/entities/Workgroup.java index 54ee2d29c..aaf8b13d6 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/Workgroup.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/Workgroup.java @@ -6,9 +6,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import edu.ucdavis.dss.ipa.api.deserializers.WorkgroupDeserializer; -import javax.persistence.*; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadAssignment.java b/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadAssignment.java index 422706d91..b70bd9b8a 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadAssignment.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadAssignment.java @@ -3,18 +3,17 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.Arrays; import java.util.List; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; @Entity @Table(name = "WorkloadAssignments") diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadSnapshot.java b/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadSnapshot.java index c2f3e513d..0cbaf3a5e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadSnapshot.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/WorkloadSnapshot.java @@ -1,12 +1,11 @@ package edu.ucdavis.dss.ipa.entities; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; @Entity @Table(name = "WorkloadSnapshots") diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/Email.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/Email.java index 5470aaa05..fecf76d04 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/Email.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/Email.java @@ -6,10 +6,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; -import javax.validation.ReportAsSingleViolation; -import javax.validation.constraints.Pattern; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jakarta.validation.ReportAsSingleViolation; +import jakarta.validation.constraints.Pattern; @Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlank.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlank.java index d791aebc1..1063a5988 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlank.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlank.java @@ -6,10 +6,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; -import javax.validation.ReportAsSingleViolation; -import javax.validation.constraints.NotNull; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jakarta.validation.ReportAsSingleViolation; +import jakarta.validation.constraints.NotNull; @Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlankValidator.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlankValidator.java index 2e563f277..36f27d826 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlankValidator.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/NotBlankValidator.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.entities.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class NotBlankValidator implements ConstraintValidator { @Override diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivity.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivity.java index d21921919..17b203195 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivity.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivity.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.entities.validation; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.*; @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE }) diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivityValidator.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivityValidator.java index 380746b61..f1428f8da 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivityValidator.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidActivityValidator.java @@ -2,8 +2,8 @@ import edu.ucdavis.dss.ipa.entities.Activity; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ValidActivityValidator implements ConstraintValidator { diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSection.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSection.java index 2cf5d0379..68d4ef1cf 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSection.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSection.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCost.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCost.java index d01a9f588..d35772ab5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCost.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCost.java @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCostValidator.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCostValidator.java index 99d49c41e..1cb9707d0 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCostValidator.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionGroupCostValidator.java @@ -2,8 +2,8 @@ import edu.ucdavis.dss.ipa.entities.SectionGroupCost; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ValidSectionGroupCostValidator implements ConstraintValidator { diff --git a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionValidator.java b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionValidator.java index 506ef6164..d3ec09898 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionValidator.java +++ b/src/main/java/edu/ucdavis/dss/ipa/entities/validation/ValidSectionValidator.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.entities.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import edu.ucdavis.dss.ipa.entities.Section; import edu.ucdavis.dss.ipa.entities.SectionGroup; diff --git a/src/main/java/edu/ucdavis/dss/ipa/exceptions/DwResponseException.java b/src/main/java/edu/ucdavis/dss/ipa/exceptions/DwResponseException.java index 07cf32ddc..c7b0df7d7 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/exceptions/DwResponseException.java +++ b/src/main/java/edu/ucdavis/dss/ipa/exceptions/DwResponseException.java @@ -3,7 +3,7 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; /** * To be used when the cause of an error is an outage or unexpected behavior diff --git a/src/main/java/edu/ucdavis/dss/ipa/exceptions/ExpiredTokenException.java b/src/main/java/edu/ucdavis/dss/ipa/exceptions/ExpiredTokenException.java index 9191d741e..51f0143ac 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/exceptions/ExpiredTokenException.java +++ b/src/main/java/edu/ucdavis/dss/ipa/exceptions/ExpiredTokenException.java @@ -3,7 +3,7 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; @SuppressWarnings("serial") @ResponseStatus(HttpStatus.UNAUTHORIZED) diff --git a/src/main/java/edu/ucdavis/dss/ipa/exceptions/RestExceptionHandler.java b/src/main/java/edu/ucdavis/dss/ipa/exceptions/RestExceptionHandler.java index 474258ad8..c922365d5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/exceptions/RestExceptionHandler.java +++ b/src/main/java/edu/ucdavis/dss/ipa/exceptions/RestExceptionHandler.java @@ -6,12 +6,12 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlValue; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AccessDeniedHandler.java b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AccessDeniedHandler.java index 5cf1c518b..86bc84ffd 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AccessDeniedHandler.java +++ b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AccessDeniedHandler.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandlerImpl; diff --git a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AsyncExceptionHandler.java b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AsyncExceptionHandler.java index 5b6d312a6..92ac07127 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AsyncExceptionHandler.java +++ b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/AsyncExceptionHandler.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.utilities.EmailService; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; -import javax.inject.Inject; +import jakarta.inject.Inject; public class AsyncExceptionHandler implements AsyncUncaughtExceptionHandler { @Inject diff --git a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/GlobalControllerExceptionHandler.java b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/GlobalControllerExceptionHandler.java index 1493c8bc1..59aa118b5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/GlobalControllerExceptionHandler.java +++ b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/GlobalControllerExceptionHandler.java @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; /** * Created by okadri on 6/22/16. diff --git a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/MvcExceptionHandler.java b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/MvcExceptionHandler.java index e418315de..d409746dd 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/MvcExceptionHandler.java +++ b/src/main/java/edu/ucdavis/dss/ipa/exceptions/handlers/MvcExceptionHandler.java @@ -11,9 +11,9 @@ import java.util.Map.Entry; import java.util.Set; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import edu.ucdavis.dss.ipa.security.Authorization; import edu.ucdavis.dss.ipa.utilities.EmailService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/repositories/RestDataWarehouseRepository.java b/src/main/java/edu/ucdavis/dss/ipa/repositories/RestDataWarehouseRepository.java index 38ab7ad2c..df711e44f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/repositories/RestDataWarehouseRepository.java +++ b/src/main/java/edu/ucdavis/dss/ipa/repositories/RestDataWarehouseRepository.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/repositories/SectionGroupCostInstructorRepository.java b/src/main/java/edu/ucdavis/dss/ipa/repositories/SectionGroupCostInstructorRepository.java index 8ca31bbe6..42abc84c1 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/repositories/SectionGroupCostInstructorRepository.java +++ b/src/main/java/edu/ucdavis/dss/ipa/repositories/SectionGroupCostInstructorRepository.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.repositories; import edu.ucdavis.dss.ipa.entities.SectionGroupCostInstructor; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; diff --git a/src/main/java/edu/ucdavis/dss/ipa/repositories/UserRepository.java b/src/main/java/edu/ucdavis/dss/ipa/repositories/UserRepository.java index 3019819a9..1f2b384dc 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/repositories/UserRepository.java +++ b/src/main/java/edu/ucdavis/dss/ipa/repositories/UserRepository.java @@ -20,11 +20,12 @@ public interface UserRepository extends CrudRepository { List findByLoginIds(@Param("loginIds") List loginIds); @Query( " SELECT DISTINCT u" + - " FROM User u, TeachingAssignment ta, Schedule s, Budget b" + + " FROM User u, Instructor i, TeachingAssignment ta, Schedule s, Budget b" + " WHERE b.id = :budgetId" + " AND b.schedule = s" + " AND ta.schedule = s" + - " AND ta.instructor = u" + " AND ta.instructor = i" + + " AND i.loginId = u.loginId" ) List findByTeachingAssignments(@Param("budgetId") long budgetId); } diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/AuthenticationFailureHandler.java b/src/main/java/edu/ucdavis/dss/ipa/security/AuthenticationFailureHandler.java index d19b4cc05..d3417be94 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/AuthenticationFailureHandler.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/AuthenticationFailureHandler.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/Authorization.java b/src/main/java/edu/ucdavis/dss/ipa/security/Authorization.java index 6ccdd931c..592b5969d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/Authorization.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/Authorization.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.WebApplicationContext; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.*; @Component diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/Authorizer.java b/src/main/java/edu/ucdavis/dss/ipa/security/Authorizer.java index dbff9409b..9fd36e5eb 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/Authorizer.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/Authorizer.java @@ -3,7 +3,7 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Helper functions to perform authorization checks in controllers, etc. diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/CasEntryPoint.java b/src/main/java/edu/ucdavis/dss/ipa/security/CasEntryPoint.java index ac6051c91..aa0c0b6ba 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/CasEntryPoint.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/CasEntryPoint.java @@ -5,13 +5,10 @@ import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.web.util.UriUtils; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.UnsupportedEncodingException; - -import static org.springframework.util.StringUtils.isEmpty; public class CasEntryPoint implements AuthenticationEntryPoint { diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/IpaPermissionEvaluator.java b/src/main/java/edu/ucdavis/dss/ipa/security/IpaPermissionEvaluator.java index 24094d249..a1deb459c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/IpaPermissionEvaluator.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/IpaPermissionEvaluator.java @@ -5,7 +5,7 @@ import org.springframework.security.access.PermissionEvaluator; import org.springframework.security.core.Authentication; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.Serializable; public class IpaPermissionEvaluator implements PermissionEvaluator { diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/SecurityHeaderFilter.java b/src/main/java/edu/ucdavis/dss/ipa/security/SecurityHeaderFilter.java index 48e466d04..c6cd6ffbc 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/SecurityHeaderFilter.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/SecurityHeaderFilter.java @@ -2,12 +2,11 @@ import org.springframework.web.filter.GenericFilterBean; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationEntryPoint.java b/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationEntryPoint.java index e56f88330..2c4760e80 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationEntryPoint.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationEntryPoint.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.core.AuthenticationException; diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationFilter.java b/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationFilter.java index 581626b52..740400b05 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationFilter.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.core.Authentication; diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationProvider.java b/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationProvider.java index dc093c6c7..0df81541c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationProvider.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/TokenAuthenticationProvider.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.authentication.AuthenticationProvider; diff --git a/src/main/java/edu/ucdavis/dss/ipa/security/TokenSimpleUrlAuthenticationSuccessHandler.java b/src/main/java/edu/ucdavis/dss/ipa/security/TokenSimpleUrlAuthenticationSuccessHandler.java index 8195e7b8c..2481160a4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/security/TokenSimpleUrlAuthenticationSuccessHandler.java +++ b/src/main/java/edu/ucdavis/dss/ipa/security/TokenSimpleUrlAuthenticationSuccessHandler.java @@ -2,9 +2,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/ActivityService.java b/src/main/java/edu/ucdavis/dss/ipa/services/ActivityService.java index 1354210a6..a3785b3db 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/ActivityService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/ActivityService.java @@ -2,13 +2,11 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import edu.ucdavis.dss.dw.dto.DwActivity; import edu.ucdavis.dss.dw.dto.DwSection; -import edu.ucdavis.dss.ipa.entities.Section; -import edu.ucdavis.dss.ipa.entities.SectionGroup; import org.springframework.validation.annotation.Validated; import edu.ucdavis.dss.ipa.entities.Activity; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/AuditLogService.java b/src/main/java/edu/ucdavis/dss/ipa/services/AuditLogService.java index 21f43a3f8..baa69bbcd 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/AuditLogService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/AuditLogService.java @@ -3,7 +3,7 @@ import edu.ucdavis.dss.ipa.entities.AuditLog; import org.springframework.validation.annotation.Validated; -import javax.validation.Valid; +import jakarta.validation.Valid; import java.util.List; @Validated diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/BudgetCalculationService.java b/src/main/java/edu/ucdavis/dss/ipa/services/BudgetCalculationService.java index 229c368da..005864d90 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/BudgetCalculationService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/BudgetCalculationService.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/LocationService.java b/src/main/java/edu/ucdavis/dss/ipa/services/LocationService.java index 422864408..397a3dde1 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/LocationService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/LocationService.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.services; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import edu.ucdavis.dss.ipa.entities.Workgroup; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/RoleService.java b/src/main/java/edu/ucdavis/dss/ipa/services/RoleService.java index ef0478d0a..454b25fa7 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/RoleService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/RoleService.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/SectionService.java b/src/main/java/edu/ucdavis/dss/ipa/services/SectionService.java index 355eebff3..5ae092c44 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/SectionService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/SectionService.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import edu.ucdavis.dss.ipa.entities.SectionGroup; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/SyncActionService.java b/src/main/java/edu/ucdavis/dss/ipa/services/SyncActionService.java index 4224ce92a..c68b93b2b 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/SyncActionService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/SyncActionService.java @@ -3,9 +3,8 @@ import edu.ucdavis.dss.ipa.entities.SyncAction; import org.springframework.validation.annotation.Validated; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.List; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @Validated public interface SyncActionService { diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/TagService.java b/src/main/java/edu/ucdavis/dss/ipa/services/TagService.java index 7f6881b42..e4ac8940f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/TagService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/TagService.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import edu.ucdavis.dss.ipa.entities.Tag; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/TeachingAssignmentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/TeachingAssignmentService.java index 098e6313f..17bd7fef7 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/TeachingAssignmentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/TeachingAssignmentService.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.services; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallReceiptService.java b/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallReceiptService.java index 7a739a903..ed02c39e0 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallReceiptService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallReceiptService.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.services; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallResponseService.java b/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallResponseService.java index dd859ba34..885921f0c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallResponseService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/TeachingCallResponseService.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import edu.ucdavis.dss.ipa.entities.*; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/TermService.java b/src/main/java/edu/ucdavis/dss/ipa/services/TermService.java index 495644809..9c8ad43d4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/TermService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/TermService.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/UserRoleService.java b/src/main/java/edu/ucdavis/dss/ipa/services/UserRoleService.java index f0b4399e0..ecee9d962 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/UserRoleService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/UserRoleService.java @@ -3,8 +3,8 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import edu.ucdavis.dss.ipa.entities.StudentSupportPreference; import edu.ucdavis.dss.ipa.entities.SupportStaff; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/UserService.java b/src/main/java/edu/ucdavis/dss/ipa/services/UserService.java index 497ffcab9..3f0ab2b9b 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/UserService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/UserService.java @@ -1,11 +1,9 @@ package edu.ucdavis.dss.ipa.services; -import java.util.Collection; import java.util.List; -import java.util.Set; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import edu.ucdavis.dss.ipa.entities.LineItem; import edu.ucdavis.dss.ipa.entities.TeachingAssignment; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/WorkgroupService.java b/src/main/java/edu/ucdavis/dss/ipa/services/WorkgroupService.java index 6b4c347e9..7e7f3b062 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/WorkgroupService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/WorkgroupService.java @@ -1,10 +1,9 @@ package edu.ucdavis.dss.ipa.services; -import java.util.Date; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import edu.ucdavis.dss.ipa.entities.*; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogService.java index ee450d1ec..7c882f6bf 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogService.java @@ -6,7 +6,7 @@ import edu.ucdavis.dss.ipa.security.Authorization; import edu.ucdavis.dss.ipa.services.ActivityLogService; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.Timestamp; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogTagService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogTagService.java index 397f9e424..61f980e4f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogTagService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityLogTagService.java @@ -3,9 +3,7 @@ import edu.ucdavis.dss.ipa.entities.ActivityLogTag; //import edu.ucdavis.dss.ipa.repositories.ActivityLogTagRepository; import edu.ucdavis.dss.ipa.services.ActivityLogTagService; -import org.springframework.stereotype.Service; -import javax.inject.Inject; import java.util.List; //@Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityService.java index 550835d62..039feee7f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityService.java @@ -10,8 +10,8 @@ import edu.ucdavis.dss.ipa.services.ActivityService; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuditLogService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuditLogService.java index 9d6c7f2b3..35dd69ac8 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuditLogService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuditLogService.java @@ -4,7 +4,7 @@ import edu.ucdavis.dss.ipa.repositories.AuditLogRepository; import edu.ucdavis.dss.ipa.services.AuditLogService; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuthenticationService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuthenticationService.java index cd5cd4992..a35cd66cf 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuthenticationService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaAuthenticationService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetScenarioService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetScenarioService.java index f7f4729b6..80dc47da1 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetScenarioService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetScenarioService.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetService.java index 3f196efa9..9bc14ed41 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetService.java @@ -1,7 +1,6 @@ package edu.ucdavis.dss.ipa.services.jpa; import edu.ucdavis.dss.ipa.entities.Budget; -import edu.ucdavis.dss.ipa.entities.InstructorTypeCost; import edu.ucdavis.dss.ipa.entities.Schedule; import edu.ucdavis.dss.ipa.repositories.BudgetRepository; import edu.ucdavis.dss.ipa.services.BudgetService; @@ -11,10 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import jakarta.inject.Inject; @Service public class JpaBudgetService implements BudgetService { diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseCommentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseCommentService.java index 11e380370..2fc9101c6 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseCommentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseCommentService.java @@ -6,9 +6,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.List; +import jakarta.inject.Inject; @Service public class JpaCourseCommentService implements CourseCommentService { diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseService.java index 2e82114ff..fdfc0b7ee 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseService.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.entities.*; import edu.ucdavis.dss.ipa.repositories.CourseRepository; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaDataWarehouseService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaDataWarehouseService.java index 12662b299..b815c2e21 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaDataWarehouseService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaDataWarehouseService.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemService.java index a80d2baf2..12ffce8e9 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemTypeService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemTypeService.java index 242c600f9..1cae162d5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemTypeService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemTypeService.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.ExpenseItemTypeService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorCostService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorCostService.java index e61053f3b..b0038d9e2 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorCostService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorCostService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorService.java index 82bc4dbbe..d3b19f95d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorService.java @@ -1,6 +1,6 @@ package edu.ucdavis.dss.ipa.services.jpa; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.entities.*; import edu.ucdavis.dss.ipa.services.ScheduleService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportCallResponseService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportCallResponseService.java index 2ab72c7b9..f798b15d0 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportCallResponseService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportCallResponseService.java @@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.sql.Date; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportPreferenceService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportPreferenceService.java index bae7bb7b5..265a220d5 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportPreferenceService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportPreferenceService.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; - import javax.inject.Inject; + import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeCostService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeCostService.java index cb6faadd4..24f535c4b 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeCostService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeCostService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeService.java index 6a632f04a..bcb3d009d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorTypeService.java @@ -9,7 +9,7 @@ import edu.ucdavis.dss.ipa.services.UserRoleService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCategoryService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCategoryService.java index f95862fed..9e316742e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCategoryService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCategoryService.java @@ -1,14 +1,11 @@ package edu.ucdavis.dss.ipa.services.jpa; -import edu.ucdavis.dss.ipa.entities.LineItem; import edu.ucdavis.dss.ipa.entities.LineItemCategory; import edu.ucdavis.dss.ipa.repositories.LineItemCategoryRepository; -import edu.ucdavis.dss.ipa.repositories.LineItemRepository; import edu.ucdavis.dss.ipa.services.LineItemCategoryService; -import edu.ucdavis.dss.ipa.services.LineItemService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCommentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCommentService.java index 6553b2106..80c98392e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCommentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemCommentService.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemService.java index 1955cfd7b..5dad70495 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemTypeService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemTypeService.java index 59c1161d2..aa46a54db 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemTypeService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLineItemTypeService.java @@ -4,7 +4,7 @@ import edu.ucdavis.dss.ipa.repositories.LineItemTypeRepository; import edu.ucdavis.dss.ipa.services.LineItemTypeService; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLocationService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLocationService.java index e22ae87e3..0a293cf31 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLocationService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaLocationService.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.services.jpa; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import edu.ucdavis.dss.ipa.entities.*; import edu.ucdavis.dss.ipa.services.TermService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaReasonCategoryService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaReasonCategoryService.java index c079f8c0a..789b3e148 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaReasonCategoryService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaReasonCategoryService.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.ReasonCategoryService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaRoleService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaRoleService.java index 443b3ee68..0c656e65f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaRoleService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaRoleService.java @@ -1,18 +1,13 @@ package edu.ucdavis.dss.ipa.services.jpa; -import java.util.ArrayList; -import java.util.Calendar; import java.util.List; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; -import edu.ucdavis.dss.ipa.entities.Workgroup; import edu.ucdavis.dss.ipa.entities.Role; -import edu.ucdavis.dss.ipa.entities.Schedule; -import edu.ucdavis.dss.ipa.repositories.WorkgroupRepository; import edu.ucdavis.dss.ipa.services.RoleService; import edu.ucdavis.dss.ipa.repositories.RoleRepository; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleInstructorNoteService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleInstructorNoteService.java index 03fc6ced1..82cbd95d3 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleInstructorNoteService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleInstructorNoteService.java @@ -1,6 +1,6 @@ package edu.ucdavis.dss.ipa.services.jpa; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.services.ScheduleService; import org.springframework.stereotype.Service; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleOpsService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleOpsService.java index 083cbb90b..a8dec490d 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleOpsService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleOpsService.java @@ -1,36 +1,28 @@ package edu.ucdavis.dss.ipa.services.jpa; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import edu.ucdavis.dss.dw.dto.DwActivity; import edu.ucdavis.dss.dw.dto.DwSection; import edu.ucdavis.dss.ipa.entities.Activity; import edu.ucdavis.dss.ipa.entities.Course; -import edu.ucdavis.dss.ipa.entities.Schedule; import edu.ucdavis.dss.ipa.entities.Section; import edu.ucdavis.dss.ipa.entities.SectionGroup; import edu.ucdavis.dss.ipa.entities.Term; import edu.ucdavis.dss.ipa.services.ActivityService; -import edu.ucdavis.dss.ipa.services.CourseService; import edu.ucdavis.dss.ipa.services.InstructorService; -import edu.ucdavis.dss.ipa.services.RoleService; import edu.ucdavis.dss.ipa.services.ScheduleOpsService; import edu.ucdavis.dss.ipa.services.ScheduleService; -import edu.ucdavis.dss.ipa.services.ScheduleTermStateService; import edu.ucdavis.dss.ipa.services.SectionGroupService; import edu.ucdavis.dss.ipa.services.SectionService; import edu.ucdavis.dss.ipa.services.TermService; -import edu.ucdavis.dss.ipa.services.UserRoleService; -import edu.ucdavis.dss.ipa.services.UserService; -import edu.ucdavis.dss.ipa.services.WorkgroupService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import edu.ucdavis.dss.ipa.repositories.DataWarehouseRepository; -import edu.ucdavis.dss.ipa.repositories.ScheduleRepository; import java.util.*; @@ -159,7 +151,7 @@ public void updateEmptySectionGroups() { try { activityService.saveActivity(activity); - } catch (javax.validation.ConstraintViolationException e) { + } catch (jakarta.validation.ConstraintViolationException e) { log.error("Could not save activity based on DW activity:" + dwActivity); } } diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleService.java index cace1e91a..9db77c63a 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleService.java @@ -1,13 +1,12 @@ package edu.ucdavis.dss.ipa.services.jpa; import java.time.Year; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.entities.*; import org.hibernate.Hibernate; @@ -17,7 +16,6 @@ import edu.ucdavis.dss.ipa.repositories.ScheduleRepository; import edu.ucdavis.dss.ipa.services.ScheduleService; import edu.ucdavis.dss.ipa.services.TermService; -import edu.ucdavis.dss.ipa.services.UserService; import edu.ucdavis.dss.ipa.services.WorkgroupService; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleTermStateService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleTermStateService.java index 1f31001c5..2f8c8adcb 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleTermStateService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaScheduleTermStateService.java @@ -4,7 +4,7 @@ import java.util.Date; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.entities.*; import edu.ucdavis.dss.ipa.services.UserService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSchedulingNoteService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSchedulingNoteService.java index 98217709b..3c85d6826 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSchedulingNoteService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSchedulingNoteService.java @@ -1,14 +1,13 @@ package edu.ucdavis.dss.ipa.services.jpa; import edu.ucdavis.dss.ipa.entities.SchedulingNote; -import edu.ucdavis.dss.ipa.entities.SectionGroup; import edu.ucdavis.dss.ipa.entities.User; import edu.ucdavis.dss.ipa.repositories.SchedulingNoteRepository; import edu.ucdavis.dss.ipa.security.Authorization; import edu.ucdavis.dss.ipa.services.SchedulingNoteService; import edu.ucdavis.dss.ipa.services.SectionGroupService; import edu.ucdavis.dss.ipa.services.UserService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostCommentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostCommentService.java index fed671fd4..23a8d8b48 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostCommentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostCommentService.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostInstructorService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostInstructorService.java index 08bd0a52a..ec8c0bb52 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostInstructorService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostInstructorService.java @@ -15,7 +15,7 @@ import edu.ucdavis.dss.ipa.services.TeachingAssignmentService; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java index eca7ab991..dd96ed202 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupCostService.java @@ -9,7 +9,7 @@ import edu.ucdavis.dss.ipa.services.SectionGroupCostService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupService.java index 43c26b5b0..c19a91d93 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionGroupService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionService.java index 5ce60f114..eafc7506f 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSectionService.java @@ -5,9 +5,9 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.validation.Valid; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; +import jakarta.validation.Valid; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportCallResponseService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportCallResponseService.java index 9115966f1..f09e517f6 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportCallResponseService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportCallResponseService.java @@ -11,8 +11,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.sql.Date; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportPreferenceService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportPreferenceService.java index ce0d3c36f..7dc46137e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportPreferenceService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaStudentSupportPreferenceService.java @@ -5,8 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import java.lang.reflect.Array; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAppointmentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAppointmentService.java index 112a459f9..1e2175520 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAppointmentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAppointmentService.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.SupportAppointmentService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.List; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAssignmentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAssignmentService.java index 784796131..c4c069039 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAssignmentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportAssignmentService.java @@ -5,7 +5,7 @@ import edu.ucdavis.dss.ipa.services.*; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportStaffService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportStaffService.java index 1716b377c..53b0eddeb 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportStaffService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSupportStaffService.java @@ -6,7 +6,7 @@ import edu.ucdavis.dss.ipa.services.SupportStaffService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSyncActionService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSyncActionService.java index 87704edc9..7903d49bb 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSyncActionService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaSyncActionService.java @@ -5,10 +5,9 @@ import edu.ucdavis.dss.ipa.services.SyncActionService; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.List; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @Service public class JpaSyncActionService implements SyncActionService { diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTagService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTagService.java index 0d3d9c8fa..f9c161813 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTagService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTagService.java @@ -8,8 +8,8 @@ import edu.ucdavis.dss.ipa.services.TagService; import org.springframework.stereotype.Service; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingAssignmentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingAssignmentService.java index 936e76edb..deec3d902 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingAssignmentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingAssignmentService.java @@ -1,6 +1,6 @@ package edu.ucdavis.dss.ipa.services.jpa; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.entities.InstructorType; import edu.ucdavis.dss.ipa.services.InstructorService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallCommentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallCommentService.java index 3b75b3256..11a66ce66 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallCommentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallCommentService.java @@ -7,7 +7,7 @@ import edu.ucdavis.dss.ipa.services.TeachingCallReceiptService; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; @Service public class JpaTeachingCallCommentService implements TeachingCallCommentService { diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallReceiptService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallReceiptService.java index 747f884eb..7f90addb4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallReceiptService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallReceiptService.java @@ -8,8 +8,8 @@ import java.util.Calendar; import java.util.List; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import edu.ucdavis.dss.ipa.services.*; import edu.ucdavis.dss.ipa.utilities.EmailService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallResponseService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallResponseService.java index ac946cbb8..3ab1ab8d4 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallResponseService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTeachingCallResponseService.java @@ -2,13 +2,10 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Calendar; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.LongStream; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import edu.ucdavis.dss.ipa.entities.*; import org.springframework.stereotype.Service; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTermService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTermService.java index 7c0ba5f81..7c00965a3 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTermService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaTermService.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserRoleService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserRoleService.java index 432c65714..72a38d12c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserRoleService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserRoleService.java @@ -9,8 +9,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import edu.ucdavis.dss.ipa.entities.Course; import edu.ucdavis.dss.ipa.entities.Instructor; @@ -24,7 +24,6 @@ import edu.ucdavis.dss.ipa.entities.UserRole; import edu.ucdavis.dss.ipa.entities.Workgroup; import edu.ucdavis.dss.ipa.repositories.InstructorTypeRepository; -import edu.ucdavis.dss.ipa.repositories.RoleRepository; import edu.ucdavis.dss.ipa.services.InstructorService; import edu.ucdavis.dss.ipa.services.RoleService; import edu.ucdavis.dss.ipa.services.ScheduleService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserService.java index 2d824a20c..2dbec5298 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaUserService.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkgroupService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkgroupService.java index 7bdfe725c..0a348f60e 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkgroupService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkgroupService.java @@ -1,18 +1,13 @@ package edu.ucdavis.dss.ipa.services.jpa; -import java.math.BigDecimal; -import java.sql.*; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; import java.util.Date; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.transaction.Transactional; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; import edu.ucdavis.dss.ipa.entities.*; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Service; diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadAssignmentService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadAssignmentService.java index 2f62ddc95..70e6c221c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadAssignmentService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadAssignmentService.java @@ -35,7 +35,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadSnapshotService.java b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadSnapshotService.java index 4ff9a4627..f6d55d890 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadSnapshotService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaWorkloadSnapshotService.java @@ -10,7 +10,7 @@ import edu.ucdavis.dss.ipa.services.WorkloadAssignmentService; import edu.ucdavis.dss.ipa.services.WorkloadSnapshotService; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/edu/ucdavis/dss/ipa/tasks/EmailNotificationTask.java b/src/main/java/edu/ucdavis/dss/ipa/tasks/EmailNotificationTask.java index 852652602..0871b909c 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/tasks/EmailNotificationTask.java +++ b/src/main/java/edu/ucdavis/dss/ipa/tasks/EmailNotificationTask.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.services.InstructorSupportCallResponseService; import edu.ucdavis.dss.ipa.services.StudentSupportCallResponseService; diff --git a/src/main/java/edu/ucdavis/dss/ipa/tasks/TermUpdateTask.java b/src/main/java/edu/ucdavis/dss/ipa/tasks/TermUpdateTask.java index 58b9919a7..c9b0193b0 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/tasks/TermUpdateTask.java +++ b/src/main/java/edu/ucdavis/dss/ipa/tasks/TermUpdateTask.java @@ -10,9 +10,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import org.springframework.test.context.ActiveProfiles; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateCourseTask.java b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateCourseTask.java index 05bf5ae84..dcf6c1d55 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateCourseTask.java +++ b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateCourseTask.java @@ -4,7 +4,6 @@ import edu.ucdavis.dss.ipa.entities.Course; import edu.ucdavis.dss.ipa.entities.Schedule; import edu.ucdavis.dss.ipa.repositories.DataWarehouseRepository; -import edu.ucdavis.dss.ipa.services.ActivityService; import edu.ucdavis.dss.ipa.services.CourseService; import edu.ucdavis.dss.ipa.services.ScheduleService; import org.slf4j.Logger; @@ -14,7 +13,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.*; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateSectionsTask.java b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateSectionsTask.java index f4263e4a8..02d3189f3 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateSectionsTask.java +++ b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateSectionsTask.java @@ -3,8 +3,6 @@ import edu.ucdavis.dss.ipa.entities.Course; import edu.ucdavis.dss.ipa.services.CourseService; import edu.ucdavis.dss.ipa.services.ScheduleOpsService; -import edu.ucdavis.dss.ipa.services.ScheduleService; -import edu.ucdavis.dss.ipa.services.WorkgroupService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -12,7 +10,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.*; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateTeachingCallTask.java b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateTeachingCallTask.java index eee11dfaa..8da856c76 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateTeachingCallTask.java +++ b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateTeachingCallTask.java @@ -1,7 +1,7 @@ package edu.ucdavis.dss.ipa.tasks; import edu.ucdavis.dss.ipa.services.TeachingCallReceiptService; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateUsersTask.java b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateUsersTask.java index 00593a843..79e82b087 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateUsersTask.java +++ b/src/main/java/edu/ucdavis/dss/ipa/tasks/UpdateUsersTask.java @@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.*; @Service diff --git a/src/main/java/edu/ucdavis/dss/ipa/utilities/DefaultEmailService.java b/src/main/java/edu/ucdavis/dss/ipa/utilities/DefaultEmailService.java index e4a4b41db..90c5938ad 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/utilities/DefaultEmailService.java +++ b/src/main/java/edu/ucdavis/dss/ipa/utilities/DefaultEmailService.java @@ -7,15 +7,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.mail.MailException; -import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.PrintWriter; import java.io.StringWriter; import java.text.SimpleDateFormat; diff --git a/src/main/java/edu/ucdavis/dss/ipa/utilities/DeleteListener.java b/src/main/java/edu/ucdavis/dss/ipa/utilities/DeleteListener.java index 510556901..5f533e0a7 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/utilities/DeleteListener.java +++ b/src/main/java/edu/ucdavis/dss/ipa/utilities/DeleteListener.java @@ -13,7 +13,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.method.HandlerMethod; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.UUID; @Component @@ -79,7 +79,7 @@ public void onPostDelete(PostDeleteEvent postDeleteEvent) { } @Override - public boolean requiresPostCommitHanding(EntityPersister entityPersister) { + public boolean requiresPostCommitHandling(EntityPersister entityPersister) { return true; } diff --git a/src/main/java/edu/ucdavis/dss/ipa/utilities/ExcelHelper.java b/src/main/java/edu/ucdavis/dss/ipa/utilities/ExcelHelper.java index d587299fd..18e6a0e06 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/utilities/ExcelHelper.java +++ b/src/main/java/edu/ucdavis/dss/ipa/utilities/ExcelHelper.java @@ -149,7 +149,7 @@ public static void deleteColumn(Sheet sheet, int columnToDelete) { Cell nextCell = row.getCell(x); if (nextCell != null) { - Cell newCell = row.createCell(x - 1, nextCell.getCellTypeEnum()); + Cell newCell = row.createCell(x - 1, nextCell.getCellType()); cloneCell(newCell, nextCell); } } @@ -164,7 +164,7 @@ private static void cloneCell(Cell cNew, Cell cOld) { cNew.setCellComment(cOld.getCellComment()); cNew.setCellStyle(cOld.getCellStyle()); - switch (cOld.getCellTypeEnum()) { + switch (cOld.getCellType()) { case BOOLEAN: { cNew.setCellValue(cOld.getBooleanCellValue()); break; diff --git a/src/main/java/edu/ucdavis/dss/ipa/utilities/HibernateListenerConfigurer.java b/src/main/java/edu/ucdavis/dss/ipa/utilities/HibernateListenerConfigurer.java index 044693ee1..a7e610ce6 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/utilities/HibernateListenerConfigurer.java +++ b/src/main/java/edu/ucdavis/dss/ipa/utilities/HibernateListenerConfigurer.java @@ -1,16 +1,14 @@ package edu.ucdavis.dss.ipa.utilities; +import jakarta.annotation.PostConstruct; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.internal.SessionFactoryImpl; -import org.hibernate.sql.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; -import java.awt.*; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnit; @Component public class HibernateListenerConfigurer { diff --git a/src/main/java/edu/ucdavis/dss/ipa/utilities/InsertListener.java b/src/main/java/edu/ucdavis/dss/ipa/utilities/InsertListener.java index e9aa0b092..4575d24cf 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/utilities/InsertListener.java +++ b/src/main/java/edu/ucdavis/dss/ipa/utilities/InsertListener.java @@ -6,17 +6,14 @@ import org.hibernate.Session; import org.hibernate.event.spi.PostCommitInsertEventListener; import org.hibernate.event.spi.PostInsertEvent; -import org.hibernate.event.spi.PostUpdateEvent; import org.hibernate.persister.entity.EntityPersister; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.support.RequestContext; -import javax.inject.Inject; -import java.util.Arrays; +import jakarta.inject.Inject; import java.util.UUID; @Component @@ -76,7 +73,7 @@ public void onPostInsert(PostInsertEvent postInsertEvent) { } @Override - public boolean requiresPostCommitHanding(EntityPersister entityPersister) { + public boolean requiresPostCommitHandling(EntityPersister entityPersister) { return true; } diff --git a/src/main/java/edu/ucdavis/dss/ipa/utilities/UpdateListener.java b/src/main/java/edu/ucdavis/dss/ipa/utilities/UpdateListener.java index 5b3ab81c2..6d3b34c56 100644 --- a/src/main/java/edu/ucdavis/dss/ipa/utilities/UpdateListener.java +++ b/src/main/java/edu/ucdavis/dss/ipa/utilities/UpdateListener.java @@ -2,7 +2,7 @@ import edu.ucdavis.dss.ipa.entities.*; import edu.ucdavis.dss.ipa.security.Authorizer; -import javax.inject.Inject; +import jakarta.inject.Inject; import edu.ucdavis.dss.ipa.services.WorkgroupService; import org.hibernate.Session; import org.hibernate.event.spi.PostCommitUpdateEventListener; @@ -86,7 +86,7 @@ public void onPostUpdate(PostUpdateEvent postUpdateEvent) { } @Override - public boolean requiresPostCommitHanding(EntityPersister entityPersister) { + public boolean requiresPostCommitHandling(EntityPersister entityPersister) { return true; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 94d3dab2f..3aa751695 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,6 +12,9 @@ spring.datasource.hikari.max-lifetime=1800000 spring.jmx.enabled=false spring.flyway.table=schema_version +# needed for hibernate lazy associations +spring.jpa.open-in-view=true + # e.g. "development" spring.profiles.active=${IPA_SPRING_PROFILE}