From c26a11ada2d27ee6d6b90f6be7042a1a230364e4 Mon Sep 17 00:00:00 2001 From: dhanendra06 <60607841+dhanendra06@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:28:26 +0530 Subject: [PATCH] MOSIP-32453: merge java21 back to develop (#1001) * MOSIP-32363 JAVA 21 upgrade Signed-off-by: Mohanachandran S * MOSIP-32363 JAVA 21 upgrade (#962) Signed-off-by: Mohanachandran S * Updated the API commons artifact ID Signed-off-by: Mohanachandran S * Updated the API commons artifact ID (#966) * MOSIP-32363 JAVA 21 upgrade Signed-off-by: Mohanachandran S * Updated the API commons artifact ID Signed-off-by: Mohanachandran S --------- Signed-off-by: Mohanachandran S * Java 21 migration for syncdata & hotlist Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * changes regarding the bean & Autowired Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * Updated the Lombok versions Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * changing annotations Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * DSD-5319 : Java21 Migration - Updated push-trigger.yml for docker image push (#972) * Update push-trigger.yml for docker image push Signed-off-by: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * Update push-trigger.yml Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> --------- Signed-off-by: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * updated rest template to resolve token issue Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * updated ChronoUnit Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> * [DSD-5366] Updated apitest in push-trigger.yml Signed-off-by: shubham_G <88794020+shubham17998@users.noreply.github.com> * Updated the maven plugins Signed-off-by: Mohanachandran S * MOSIP-32453 Signed-off-by: dhanendra06 * fixed test cases for admin-service Signed-off-by: dhanendra06 * fixed test cases for masterdata Signed-off-by: dhanendra06 * fixed test cases for masterdata Signed-off-by: dhanendra06 * fixed test cases for masterdata Signed-off-by: dhanendra06 * fixed test cases for masterdata Signed-off-by: dhanendra06 * MOSIP-32453: Added the db script for spring batch Signed-off-by: dhanendra06 * fixed db script order issue Signed-off-by: dhanendra06 * Added revoke script Signed-off-by: dhanendra06 * Added VM arguments in docker file Signed-off-by: dhanendra06 * Added VM arguments in docker file Signed-off-by: dhanendra06 * MOSIP-32453 (#989) * MOSIP-32453 * MOSIP-32453 Signed-off-by: dhanendra06 --------- Signed-off-by: dhanendra06 * MOSIP-32453: resolved audit issue (#990) * MOSIP-32453 * MOSIP-32453 Signed-off-by: dhanendra06 * MOSIP-32453 Signed-off-by: dhanendra06 --------- Signed-off-by: dhanendra06 * MOSIP-32453: fixed delete query issue (#991) Signed-off-by: dhanendra06 * [DSD-5366] Updated Dockerfile Signed-off-by: shubham_G <88794020+shubham17998@users.noreply.github.com> * MOSIP-32453: fixed center creation issue (#995) * MOSIP-32453: fixed delete query issue Signed-off-by: dhanendra06 * fixed registrationcenter creation issue Signed-off-by: dhanendra06 --------- Signed-off-by: dhanendra06 * MOSIP-32453: fixed bulkupload issue (#997) * MOSIP-32453: fixed delete query issue Signed-off-by: dhanendra06 * fixed registrationcenter creation issue Signed-off-by: dhanendra06 * fixed bulkupload issue Signed-off-by: dhanendra06 --------- Signed-off-by: dhanendra06 * removed commented code Signed-off-by: dhanendra06 * fixed the test cases Signed-off-by: dhanendra06 --------- Signed-off-by: Mohanachandran S Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Signed-off-by: Gokulraj C <110164849+GOKULRAJ136@users.noreply.github.com> Signed-off-by: shubham_G <88794020+shubham17998@users.noreply.github.com> Signed-off-by: dhanendra06 Co-authored-by: Mohanachandran S Co-authored-by: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com> Co-authored-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com> Co-authored-by: Chandra Keshav Mishra Co-authored-by: shubham_G <88794020+shubham17998@users.noreply.github.com> --- .github/workflows/db-test.yml | 2 +- .github/workflows/push-trigger.yml | 30 +- admin/admin-service/Dockerfile | 16 +- admin/admin-service/pom.xml | 170 ++- .../io/mosip/admin/AdminBootApplication.java | 7 +- .../batch/CustomChunkListener.java | 4 +- .../batch/CustomExcelRowMapper.java | 6 +- .../batch/CustomLineMapper.java | 6 +- .../batch/JobResultListener.java | 8 +- .../batch/PacketJobResultListener.java | 19 +- .../batch/PacketUploadTasklet.java | 1 - .../batch/RepositoryListItemWriter.java | 15 +- .../dto/MachineRegistrationCenterDto.java | 4 +- .../entity/ApplicantUserDetailsEntity.java | 2 +- .../entity/ApplicantValidDocument.java | 15 +- .../bulkdataupload/entity/Application.java | 14 +- .../bulkdataupload/entity/BaseEntity.java | 4 +- .../entity/BiometricAttribute.java | 20 +- .../bulkdataupload/entity/BiometricType.java | 14 +- .../entity/BlocklistedWords.java | 8 +- .../entity/BulkUploadTranscation.java | 10 +- .../bulkdataupload/entity/DaysOfWeek.java | 15 +- .../admin/bulkdataupload/entity/Device.java | 24 +- .../bulkdataupload/entity/DeviceHistory.java | 14 +- .../bulkdataupload/entity/DeviceProvider.java | 8 +- .../entity/DeviceProviderHistory.java | 8 +- .../bulkdataupload/entity/DeviceRegister.java | 8 +- .../entity/DeviceRegisterHistory.java | 12 +- .../entity/DeviceSpecification.java | 22 +- .../bulkdataupload/entity/DeviceType.java | 14 +- .../entity/DocumentCategory.java | 16 +- .../bulkdataupload/entity/DocumentType.java | 16 +- .../bulkdataupload/entity/DynamicField.java | 8 +- .../entity/ExceptionalHoliday.java | 10 +- .../entity/FoundationalTrustProvider.java | 8 +- .../FoundationalTrustProviderHistory.java | 8 +- .../admin/bulkdataupload/entity/Gender.java | 14 +- .../admin/bulkdataupload/entity/Holiday.java | 14 +- .../admin/bulkdataupload/entity/IdType.java | 14 +- .../bulkdataupload/entity/IdentitySchema.java | 8 +- .../bulkdataupload/entity/IndividualType.java | 10 +- .../admin/bulkdataupload/entity/Language.java | 8 +- .../admin/bulkdataupload/entity/Location.java | 14 +- .../entity/LocationHierarchy.java | 14 +- .../entity/MOSIPDeviceService.java | 14 +- .../entity/MOSIPDeviceServiceHistory.java | 8 +- .../admin/bulkdataupload/entity/Machine.java | 25 +- .../bulkdataupload/entity/MachineHistory.java | 14 +- .../entity/MachineSpecification.java | 20 +- .../bulkdataupload/entity/MachineType.java | 10 +- .../bulkdataupload/entity/ModuleDetail.java | 10 +- .../bulkdataupload/entity/ReasonCategory.java | 14 +- .../bulkdataupload/entity/ReasonList.java | 16 +- .../entity/RegExceptionalHoliday.java | 10 +- .../entity/RegWorkingNonWorking.java | 16 +- .../entity/RegisteredDevice.java | 14 +- .../entity/RegisteredDeviceHistory.java | 8 +- .../entity/RegistrationCenter.java | 26 +- .../entity/RegistrationCenterDevice.java | 20 +- .../RegistrationCenterDeviceHistory.java | 12 +- .../RegistrationCenterDeviceHistoryPk.java | 4 +- .../entity/RegistrationCenterHistory.java | 22 +- .../entity/RegistrationCenterMachine.java | 20 +- .../RegistrationCenterMachineDevice.java | 12 +- ...egistrationCenterMachineDeviceHistory.java | 12 +- .../RegistrationCenterMachineHistory.java | 12 +- .../entity/RegistrationCenterType.java | 18 +- .../entity/RegistrationCenterUser.java | 10 +- .../entity/RegistrationCenterUserHistory.java | 12 +- .../RegistrationCenterUserHistoryPk.java | 4 +- .../entity/RegistrationCenterUserMachine.java | 12 +- .../RegistrationCenterUserMachineHistory.java | 14 +- .../entity/RegistrationDeviceSubType.java | 8 +- .../entity/RegistrationDeviceType.java | 8 +- .../entity/SchemaDefinition.java | 8 +- .../admin/bulkdataupload/entity/Template.java | 22 +- .../entity/TemplateFileFormat.java | 14 +- .../bulkdataupload/entity/TemplateType.java | 14 +- .../admin/bulkdataupload/entity/Title.java | 14 +- .../entity/UserDetailHistoryPk.java | 4 +- .../bulkdataupload/entity/UserDetails.java | 8 +- .../entity/UserDetailsHistory.java | 14 +- .../bulkdataupload/entity/ValidDocument.java | 22 +- .../admin/bulkdataupload/entity/Zone.java | 10 +- .../admin/bulkdataupload/entity/ZoneUser.java | 12 +- .../entity/ZoneUserHistory.java | 10 +- .../entity/id/ApplicantValidDocumentId.java | 4 +- .../entity/id/CodeAndLanguageCodeID.java | 4 +- .../id/CodeLangCodeAndRsnCatCodeID.java | 2 +- .../entity/id/DeviceRegisterHistoryId.java | 2 +- .../entity/id/ExcptionalHolidayId.java | 4 +- .../bulkdataupload/entity/id/GenderID.java | 4 +- .../bulkdataupload/entity/id/HolidayID.java | 4 +- .../entity/id/IdAndEffectDateTimeID.java | 4 +- .../entity/id/IdAndLanguageCodeID.java | 4 +- .../id/LocationCodeAndLanguageCodeID.java | 4 +- .../entity/id/LocationHierarchyId.java | 4 +- .../entity/id/RegExceptionalHolidayID.java | 2 +- .../entity/id/RegWorkingNonWorkingId.java | 2 +- .../entity/id/RegistrationCenterDeviceID.java | 4 +- .../id/RegistrationCenterHistoryID.java | 4 +- ...istrationCenterMachineDeviceHistoryID.java | 4 +- .../id/RegistrationCenterMachineDeviceID.java | 4 +- .../RegistrationCenterMachineHistoryID.java | 4 +- .../id/RegistrationCenterMachineID.java | 4 +- ...egistrationCenterMachineUserHistoryID.java | 4 +- .../id/RegistrationCenterMachineUserID.java | 4 +- .../entity/id/RegistrationCenterUserID.java | 4 +- .../entity/id/ValidDocumentID.java | 4 +- .../bulkdataupload/entity/id/WeekDayId.java | 2 +- .../entity/id/WordAndLanguageCodeID.java | 4 +- .../entity/id/ZoneUserHistoryId.java | 6 +- .../bulkdataupload/entity/id/ZoneUserId.java | 4 +- .../ApplicantValidDocumentRepository.java | 4 +- .../BulkUploadTranscationRepository.java | 14 +- .../DeviceProviderRepository.java | 6 +- .../ExceptionalHolidayRepository.java | 2 +- .../repositories/HolidayRepository.java | 2 +- .../repositories/IdTypeRepository.java | 2 +- .../IdentitySchemaRepository.java | 5 - .../MOSIPDeviceServiceRepository.java | 2 +- .../RegistrationCenterMachineRepository.java | 4 +- .../RegistrationCenterRepository.java | 6 +- ...ionCenterUserMachineHistoryRepository.java | 4 - .../RegistrationDeviceSubTypeRepository.java | 3 - .../repositories/TemplateRepository.java | 6 +- .../service/PacketUploadService.java | 3 +- .../impl/BulkDataUploadServiceImpl.java | 33 +- .../admin/config/AntPathMatcherConfig.java | 17 + .../io/mosip/admin/config/CommonConfig.java | 5 +- .../java/io/mosip/admin/config/Mapper.java | 7 +- .../io/mosip/admin/config/MapperUtils.java | 2 +- .../config/ResponseBodyAdviceConfig.java | 4 +- .../mosip/admin/config/SpringBatchConfig.java | 41 +- .../io/mosip/admin/config/SwaggerConfig.java | 2 +- .../controller/KeyManagerProxyController.java | 2 +- .../controller/MasterdataProxyController.java | 2 +- .../admin/dto/RegProcRequestWrapper.java | 2 +- .../admin/dto/RegProcResponseWrapper.java | 2 +- .../java/io/mosip/admin/dto/SearchInfo.java | 4 +- .../mosip/admin/httpfilter/ReqResFilter.java | 16 +- .../AuditManagerProxyController.java | 2 +- .../dto/AuditManagerRequestDto.java | 4 +- .../dto/AuditRequestDto.java | 4 +- .../exception/ApiExceptionHandler.java | 21 +- .../impl/AuditManagerProxyServiceImpl.java | 5 +- .../packetstatusupdater/util/AuditUtil.java | 4 +- .../admin/service/AdminProxyService.java | 2 +- .../admin/util/AdminProxyServiceUtil.java | 3 +- .../admin/util/CbeffToBiometricUtil.java | 2 - .../java/io/mosip/admin/util/Utility.java | 1 - .../admin/validator/AlphabeticValidator.java | 4 +- .../validator/LanguageCharacterValidator.java | 4 +- .../io/mosip/admin/TestBootApplication.java | 20 +- .../controller/test/AdminControllerTest.java | 52 +- .../test/ApplicantDetailsControllerTest.java | 17 +- .../test/BulkDataUploadControllerTest.java | 23 +- .../AuditManagerProxyServiceTest.java | 2 +- .../config/TestConfig.java | 71 +- .../config/TestSecurityConfig.java | 40 +- .../admin/util/PacketUploadServiceTest.java | 2 + .../resources/application-test.properties | 2 +- .../src/test/resources/schema.sql | 213 ++-- admin/hotlist-service/Dockerfile | 12 +- admin/hotlist-service/pom.xml | 155 ++- .../mosip/hotlist/HotlistMainApplication.java | 2 +- .../mosip/hotlist/config/HotlistConfig.java | 24 +- .../mosip/hotlist/config/SwaggerConfig.java | 13 +- .../hotlist/controller/HotlistController.java | 31 +- .../io/mosip/hotlist/dto/AuditRequestDTO.java | 9 +- .../io/mosip/hotlist/dto/RestRequestDTO.java | 10 +- .../java/io/mosip/hotlist/entity/Hotlist.java | 15 +- .../mosip/hotlist/entity/HotlistHistory.java | 15 +- .../hotlist/event/HotlistEventHandler.java | 25 +- .../exception/HotlistExceptionHandler.java | 37 +- .../exception/RestServiceException.java | 4 +- .../io/mosip/hotlist/helper/RestHelper.java | 42 +- .../service/impl/HotlistServiceImpl.java | 23 +- .../hotlist/validator/HotlistValidator.java | 26 +- .../builder/AuditRequestBuilderTest.java | 25 +- .../builder/RestRequestBuilderTest.java | 24 +- .../controller/HotlistControllerTest.java | 25 +- .../event/HotlistEventHandlerTest.java | 19 +- .../mosip/hotlist/helper/AuditHelperTest.java | 19 +- .../mosip/hotlist/helper/RestHelperTest.java | 628 +++------ .../HotlistEntityInterceptorTest.java | 23 +- .../job/HotlistScheduledCleanupJobTest.java | 17 +- .../security/HotlistSecurityManagerTest.java | 44 +- .../hotlist/service/HotlistServiceTest.java | 38 +- admin/kernel-masterdata-service/Dockerfile | 16 +- admin/kernel-masterdata-service/pom.xml | 116 +- .../masterdata/MasterDataBootApplication.java | 14 +- .../masterdata/config/AuditConfigurer.java | 2 - .../masterdata/config/AuditInterceptor.java | 4 +- .../masterdata/config/CommonConfig.java | 13 +- .../config/MasterDataInterceptor.java | 6 +- .../config/ResponseBodyAdviceConfig.java | 4 +- .../masterdata/config/SwaggerConfig.java | 2 +- .../masterdata/constant/MachinePutReqDto.java | 4 +- .../controller/ApplicantTypeController.java | 3 +- .../controller/ApplicationController.java | 2 +- .../BiometricAttributeController.java | 2 +- .../controller/BiometricTypeController.java | 2 +- .../BlocklistedWordsController.java | 2 +- .../controller/DeviceController.java | 2 +- .../controller/DeviceProviderController.java | 2 +- .../DeviceProviderManagementController.java | 2 +- .../controller/DeviceRegisterController.java | 4 +- .../DeviceSpecificationController.java | 2 +- .../controller/DeviceTypeController.java | 2 +- .../DocumentCategoryController.java | 3 +- .../controller/DocumentTypeController.java | 2 +- .../controller/DynamicFieldController.java | 2 +- .../FoundationalTrustProviderController.java | 2 +- .../controller/GenderTypeController.java | 2 +- .../controller/HolidayController.java | 2 +- .../controller/IdTypeController.java | 2 +- .../controller/IndividualTypeController.java | 2 +- .../controller/LanguageController.java | 2 +- .../controller/LocationController.java | 2 +- .../MOSIPDeviceServiceController.java | 2 +- .../controller/MachineController.java | 2 +- .../MachineSpecificationController.java | 2 +- .../controller/MachineTypeController.java | 2 +- .../PacketRejectionReasonController.java | 2 +- .../controller/PacketWorkflowController.java | 2 +- .../RegisteredDeviceController.java | 4 +- .../RegistrationCenterController.java | 2 +- .../RegistrationCenterTypeController.java | 2 +- .../controller/SchemaController.java | 2 +- .../controller/TemplateController.java | 2 +- .../TemplateFileFormatController.java | 2 +- .../controller/TemplateTypeController.java | 2 +- .../controller/TitleController.java | 2 +- .../controller/UISpecController.java | 2 +- .../controller/UserDetailsController.java | 2 +- .../controller/ValidDocumentController.java | 6 +- .../masterdata/controller/ZoneController.java | 3 +- .../controller/ZoneUserController.java | 4 +- .../kernel/masterdata/dto/ApplicationDto.java | 4 +- .../masterdata/dto/BiometricAttributeDto.java | 4 +- .../masterdata/dto/BiometricTypeDto.java | 4 +- .../dto/BlockListedWordsUpdateDto.java | 4 +- .../masterdata/dto/BlocklistedWordsDto.java | 4 +- .../dto/DeRegisterDevicePostDto.java | 2 +- .../dto/DeRegisterDeviceReqDto.java | 4 +- .../kernel/masterdata/dto/DeviceDto.java | 5 +- .../masterdata/dto/DeviceProviderDto.java | 4 +- .../masterdata/dto/DeviceProviderPutDto.java | 4 +- .../masterdata/dto/DevicePutReqDto.java | 4 +- .../dto/DeviceRegistrationCenterDto.java | 6 +- .../dto/DeviceSpecificationDto.java | 4 +- .../dto/DeviceSpecificationPutDto.java | 4 +- .../kernel/masterdata/dto/DeviceTypeDto.java | 4 +- .../masterdata/dto/DeviceTypePutDto.java | 4 +- .../dto/DigitalIdDeviceRegisterDto.java | 2 +- .../kernel/masterdata/dto/DigitalIdDto.java | 6 +- .../masterdata/dto/DocumentCategoryDto.java | 4 +- .../dto/DocumentCategoryPutDto.java | 4 +- .../masterdata/dto/DocumentTypeDto.java | 4 +- .../masterdata/dto/DocumentTypePutReqDto.java | 4 +- .../masterdata/dto/DynamicFieldDto.java | 2 +- .../masterdata/dto/DynamicFieldPutDto.java | 8 +- .../masterdata/dto/DynamicFieldValueDto.java | 4 +- .../dto/DynamicFieldValuePutDto.java | 2 +- .../masterdata/dto/ExceptionalHolidayDto.java | 6 +- .../dto/FoundationalTrustProviderDto.java | 2 +- .../dto/FoundationalTrustProviderPutDto.java | 2 +- .../kernel/masterdata/dto/GenderTypeDto.java | 6 +- .../kernel/masterdata/dto/HolidayDto.java | 2 +- .../masterdata/dto/HolidayIdDeleteDto.java | 4 +- .../io/mosip/kernel/masterdata/dto/IdDto.java | 6 +- .../masterdata/dto/IdSchemaPublishDto.java | 2 +- .../kernel/masterdata/dto/IdTypeDto.java | 6 +- .../masterdata/dto/IdentitySchemaDto.java | 4 +- .../masterdata/dto/IndividualTypeDto.java | 6 +- .../kernel/masterdata/dto/LanguageDto.java | 6 +- .../kernel/masterdata/dto/LanguagePutDto.java | 4 +- .../masterdata/dto/LocationCreateDto.java | 6 +- .../kernel/masterdata/dto/LocationDto.java | 6 +- .../dto/LocationHierarchyLevelDto.java | 6 +- .../kernel/masterdata/dto/LocationPutDto.java | 4 +- .../masterdata/dto/MOSIPDeviceServiceDto.java | 2 +- .../dto/MOSIPDeviceServiceExtDto.java | 6 +- .../kernel/masterdata/dto/MachineDto.java | 2 +- .../masterdata/dto/MachinePostReqDto.java | 6 +- .../dto/MachineRegistrationCenterDto.java | 6 +- .../dto/MachineSpecificationDto.java | 4 +- .../dto/MachineSpecificationPutDto.java | 4 +- .../kernel/masterdata/dto/MachineTypeDto.java | 4 +- .../masterdata/dto/MachineTypePutDto.java | 4 +- .../kernel/masterdata/dto/ModuleDto.java | 6 +- .../masterdata/dto/PostReasonCategoryDto.java | 6 +- .../masterdata/dto/ReasonCategoryDto.java | 6 +- .../kernel/masterdata/dto/ReasonListDto.java | 6 +- .../dto/RegCenterLanguageSpecificPutDto.java | 4 +- .../dto/RegCenterMachineUserReqDto.java | 4 +- .../RegCenterNonLanguageSpecificPutDto.java | 8 +- .../masterdata/dto/RegCenterPostReqDto.java | 6 +- .../masterdata/dto/RegCenterPutReqDto.java | 8 +- .../masterdata/dto/RegProcRequestWrapper.java | 2 +- .../dto/RegProcResponseWrapper.java | 2 +- .../masterdata/dto/RegcenterBaseDto.java | 6 +- .../dto/RegistarionCenterReqDto.java | 4 +- .../dto/RegisteredDevicePostReqDto.java | 8 +- .../dto/RegistrationCenterDeviceDto.java | 6 +- .../masterdata/dto/RegistrationCenterDto.java | 6 +- .../dto/RegistrationCenterHistoryDto.java | 6 +- .../RegistrationCenterMachineDeviceDto.java | 6 +- ...strationCenterMachineDeviceHistoryDto.java | 6 +- .../dto/RegistrationCenterMachineDto.java | 6 +- .../dto/RegistrationCenterPutDto.java | 2 +- .../dto/RegistrationCenterReqAdmSecDto.java | 2 +- .../dto/RegistrationCenterTypeDto.java | 4 +- .../dto/RegistrationCenterTypePutDto.java | 4 +- .../dto/RegistrationCenterUserDto.java | 6 +- ...gistrationCenterUserMachineMappingDto.java | 6 +- .../kernel/masterdata/dto/SchemaDto.java | 8 +- .../dto/SearchDtoWithoutLangCode.java | 4 +- .../kernel/masterdata/dto/TemplateDto.java | 4 +- .../masterdata/dto/TemplateFileFormatDto.java | 2 +- .../dto/TemplateFileFormatPutDto.java | 2 +- .../kernel/masterdata/dto/TemplatePutDto.java | 4 +- .../masterdata/dto/TemplateTypeDto.java | 4 +- .../mosip/kernel/masterdata/dto/TitleDto.java | 6 +- .../kernel/masterdata/dto/UserDetailsDto.java | 6 +- .../masterdata/dto/UserDetailsGetExtnDto.java | 6 +- .../masterdata/dto/UserDetailsPutDto.java | 6 +- .../masterdata/dto/UserDetailsPutReqDto.java | 6 +- .../masterdata/dto/ValidDocCategoryDto.java | 6 +- .../masterdata/dto/ValidDocumentDto.java | 2 +- .../masterdata/dto/ValidateDeviceDto.java | 4 +- .../kernel/masterdata/dto/ZoneUserDto.java | 4 +- .../kernel/masterdata/dto/ZoneUserPutDto.java | 2 +- .../DocumentCategoryAndTypeResponseDto.java | 6 +- .../dto/getresponse/LocationHierarchyDto.java | 4 +- .../dto/getresponse/ValidDocumentMapDto.java | 6 +- .../dto/getresponse/extn/DeviceExtnDto.java | 4 +- .../extn/DeviceProviderExtnDto.java | 4 +- .../dto/getresponse/extn/MachineExtnDto.java | 4 +- .../extn/RegisteredDeviceExtnDto.java | 4 +- .../extn/RegistrationCenterExtnDto.java | 4 +- .../getresponse/extn/WorkingDaysExtnDto.java | 2 +- .../DocumentTypePostResponseDto.java | 2 +- .../DocumentTypePutResponseDto.java | 2 +- .../dto/registerdevice/DeviceData.java | 2 +- .../dto/registerdevice/DeviceInfo.java | 2 +- .../dto/registerdevice/DigitalId.java | 2 +- .../dto/registerdevice/SignRequestDto.java | 2 +- .../dto/request/AuditRequestDto.java | 4 +- .../masterdata/dto/request/FilterDto.java | 4 +- .../dto/request/FilterValueDto.java | 4 +- .../masterdata/dto/request/RequestDTO.java | 2 +- .../masterdata/dto/request/SearchDto.java | 4 +- .../dto/request/WorkingDaysPutRequestDto.java | 5 +- .../dto/response/DeviceSearchDto.java | 4 +- .../dto/response/HolidaySearchDto.java | 6 +- .../dto/response/LocationPostResponseDto.java | 2 +- .../dto/response/LocationPutResponseDto.java | 2 +- .../dto/response/LocationSearchDto.java | 2 +- .../dto/response/MachineSearchDto.java | 6 +- .../dto/response/PageResponseDto.java | 2 +- .../response/RegistrationCenterSearchDto.java | 4 +- .../masterdata/dto/response/ResponseDTO.java | 2 +- .../entity/ApplicantValidDocument.java | 12 +- .../kernel/masterdata/entity/Application.java | 14 +- .../kernel/masterdata/entity/BaseEntity.java | 4 +- .../masterdata/entity/BiometricAttribute.java | 18 +- .../masterdata/entity/BiometricType.java | 10 +- .../masterdata/entity/BlocklistedWords.java | 8 +- .../kernel/masterdata/entity/DaysOfWeek.java | 14 +- .../kernel/masterdata/entity/Device.java | 18 +- .../masterdata/entity/DeviceHistory.java | 14 +- .../masterdata/entity/DeviceProvider.java | 8 +- .../entity/DeviceProviderHistory.java | 8 +- .../masterdata/entity/DeviceRegister.java | 8 +- .../entity/DeviceRegisterHistory.java | 12 +- .../entity/DeviceSpecification.java | 16 +- .../kernel/masterdata/entity/DeviceType.java | 10 +- .../masterdata/entity/DocumentCategory.java | 16 +- .../masterdata/entity/DocumentType.java | 16 +- .../masterdata/entity/DynamicField.java | 8 +- .../entity/DynamicFieldDefinition.java | 2 +- .../masterdata/entity/ExceptionalHoliday.java | 10 +- .../entity/FoundationalTrustProvider.java | 8 +- .../FoundationalTrustProviderHistory.java | 8 +- .../kernel/masterdata/entity/Gender.java | 14 +- .../kernel/masterdata/entity/Holiday.java | 14 +- .../kernel/masterdata/entity/IdType.java | 14 +- .../masterdata/entity/IdentitySchema.java | 8 +- .../masterdata/entity/IndividualType.java | 10 +- .../kernel/masterdata/entity/Language.java | 8 +- .../kernel/masterdata/entity/Location.java | 14 +- .../masterdata/entity/LocationHierarchy.java | 14 +- .../masterdata/entity/MOSIPDeviceService.java | 14 +- .../entity/MOSIPDeviceServiceHistory.java | 8 +- .../kernel/masterdata/entity/Machine.java | 18 +- .../masterdata/entity/MachineHistory.java | 14 +- .../entity/MachineSpecification.java | 16 +- .../kernel/masterdata/entity/MachineType.java | 8 +- .../masterdata/entity/ModuleDetail.java | 10 +- .../masterdata/entity/ReasonCategory.java | 14 +- .../kernel/masterdata/entity/ReasonList.java | 16 +- .../entity/RegExceptionalHoliday.java | 10 +- .../entity/RegWorkingNonWorking.java | 16 +- .../masterdata/entity/RegisteredDevice.java | 14 +- .../entity/RegisteredDeviceHistory.java | 8 +- .../masterdata/entity/RegistrationCenter.java | 26 +- .../entity/RegistrationCenterHistory.java | 22 +- .../entity/RegistrationCenterType.java | 18 +- .../entity/RegistrationDeviceSubType.java | 8 +- .../entity/RegistrationDeviceType.java | 8 +- .../masterdata/entity/SchemaDefinition.java | 8 +- .../kernel/masterdata/entity/Template.java | 22 +- .../masterdata/entity/TemplateFileFormat.java | 2 +- .../masterdata/entity/TemplateType.java | 2 +- .../mosip/kernel/masterdata/entity/Title.java | 14 +- .../kernel/masterdata/entity/UISpec.java | 8 +- .../entity/UserDetailHistoryPk.java | 4 +- .../kernel/masterdata/entity/UserDetails.java | 8 +- .../masterdata/entity/UserDetailsHistory.java | 14 +- .../masterdata/entity/ValidDocument.java | 22 +- .../mosip/kernel/masterdata/entity/Zone.java | 10 +- .../kernel/masterdata/entity/ZoneUser.java | 10 +- .../masterdata/entity/ZoneUserHistory.java | 10 +- .../entity/id/ApplicantValidDocumentId.java | 4 +- .../entity/id/CodeAndLanguageCodeID.java | 4 +- .../id/CodeLangCodeAndRsnCatCodeID.java | 2 +- .../entity/id/DeviceRegisterHistoryId.java | 2 +- .../entity/id/ExcptionalHolidayId.java | 4 +- .../kernel/masterdata/entity/id/GenderID.java | 4 +- .../masterdata/entity/id/HolidayID.java | 4 +- .../entity/id/IdAndEffectDateTimeID.java | 4 +- .../entity/id/IdAndLanguageCodeID.java | 4 +- .../id/LocationCodeAndLanguageCodeID.java | 4 +- .../entity/id/LocationHierarchyId.java | 5 +- .../entity/id/RegExceptionalHolidayID.java | 2 +- .../entity/id/RegWorkingNonWorkingId.java | 2 +- .../entity/id/RegistrationCenterDeviceID.java | 4 +- .../id/RegistrationCenterHistoryID.java | 4 +- ...istrationCenterMachineDeviceHistoryID.java | 4 +- .../id/RegistrationCenterMachineDeviceID.java | 4 +- .../RegistrationCenterMachineHistoryID.java | 4 +- .../id/RegistrationCenterMachineID.java | 4 +- ...egistrationCenterMachineUserHistoryID.java | 4 +- .../id/RegistrationCenterMachineUserID.java | 4 +- .../entity/id/RegistrationCenterUserID.java | 4 +- .../masterdata/entity/id/ValidDocumentID.java | 4 +- .../masterdata/entity/id/WeekDayId.java | 2 +- .../entity/id/WordAndLanguageCodeID.java | 4 +- .../entity/id/ZoneUserHistoryId.java | 4 +- .../masterdata/entity/id/ZoneUserId.java | 4 +- .../exception/ApiExceptionHandler.java | 4 +- .../masterdata/httpfilter/ReqResFilter.java | 16 +- .../ExceptionalHolidayRepository.java | 4 +- .../repository/HolidayRepository.java | 9 +- .../repository/IdTypeRepository.java | 2 +- .../RegistrationCenterRepository.java | 2 +- .../repository/UISpecRepository.java | 23 +- .../repository/UserDetailsRepository.java | 4 +- .../service/RegisteredDeviceService.java | 4 +- .../service/RegistrationCenterService.java | 2 +- .../service/UserDetailsService.java | 2 +- .../impl/ApplicantTypeServiceImpl.java | 9 - .../impl/BlocklistedWordsServiceImpl.java | 4 +- .../service/impl/DeviceServiceImpl.java | 3 - .../impl/DocumentCategoryServiceImpl.java | 2 +- .../service/impl/DocumentTypeServiceImpl.java | 2 +- .../service/impl/DynamicFieldServiceImpl.java | 2 +- .../FoundationalTrustProviderServiceImpl.java | 2 +- .../service/impl/GenderTypeServiceImpl.java | 2 +- .../impl/RegisteredDeviceServiceImpl.java | 12 +- .../impl/RegistrationCenterServiceImpl.java | 4 +- .../RegistrationCenterTypeServiceImpl.java | 2 +- .../service/impl/TemplateServiceImpl.java | 2 +- .../service/impl/TitleServiceImpl.java | 4 +- .../service/impl/UISpecServiceImpl.java | 2 +- .../service/impl/UserDetailsServiceImpl.java | 36 +- .../impl/ValidDocumentServiceImpl.java | 2 +- .../service/impl/ZoneServiceImpl.java | 5 - .../masterdata/uispec/dto/UISpecDto.java | 4 +- .../uispec/dto/UISpecPublishDto.java | 2 +- .../kernel/masterdata/utils/AuditUtil.java | 6 +- .../masterdata/utils/LanguageUtils.java | 4 +- .../kernel/masterdata/utils/MapperUtils.java | 4 +- .../utils/MasterDataFilterHelper.java | 38 +- .../utils/MasterdataCreationUtil.java | 25 +- .../utils/MasterdataSearchHelper.java | 85 +- .../utils/RegistrationCenterValidator.java | 2 +- .../kernel/masterdata/utils/RestClient.java | 29 +- .../kernel/masterdata/utils/ZoneUtils.java | 6 + .../validator/AlphabeticValidator.java | 4 +- .../masterdata/validator/CenterTypeCode.java | 6 +- .../validator/CenterTypeCodeValidator.java | 4 +- .../validator/CharacterValidator.java | 4 +- .../validator/LanguageCharacterValidator.java | 4 +- .../validator/LocalDateValidator.java | 4 +- .../validator/OptionalStringFormatter.java | 6 +- .../validator/OptionalStringTrimmer.java | 10 +- .../masterdata/validator/PositiveInteger.java | 4 +- .../masterdata/validator/PositiveValue.java | 4 +- .../validator/SpecialCharacterValidator.java | 4 +- .../masterdata/validator/StringFormatter.java | 6 +- .../masterdata/validator/StringTrimmer.java | 10 +- .../masterdata/validator/ValidDateFormat.java | 4 +- .../masterdata/validator/ValidLangCode.java | 4 +- .../CertificateLevelValidator.java | 8 +- .../FoundationalValidator.java | 8 +- .../registereddevice/PurposeValidator.java | 8 +- .../registereddevice/StatusCodeValidator.java | 8 +- .../registereddevice/TypeValidator.java | 8 +- .../ValidCertificateLevel.java | 4 +- .../registereddevice/ValidFoundational.java | 4 +- .../registereddevice/ValidPurpose.java | 4 +- .../registereddevice/ValidStatusCode.java | 4 +- .../validator/registereddevice/ValidType.java | 4 +- .../masterdata/test/TestBootApplication.java | 18 +- .../masterdata/test/config/TestConfig.java | 309 ++++- .../test/config/TestSecurityConfig.java | 46 +- .../DocumentCategoryControllerTest.java | 3 + .../DynamicFieldControllerTest.java | 14 +- .../controller/HolidayControllerTest.java | 4 +- .../IdentitySchemaControllerTest.java | 15 +- .../controller/IntegratedRepositoryTest.java | 9 +- .../controller/LocationControllerTest.java | 4 + .../MachineHistoryControllerTest.java | 4 +- .../RegistrationCenterControllerTest.java | 25 +- .../RegistrationCenterTypeControllerTest.java | 9 +- .../test/controller/SchemaControllerTest.java | 4 +- .../controller/TemplateControllerTest.java | 7 +- .../test/controller/TitleControllerTest.java | 4 +- .../test/controller/UISpecControllerTest.java | 4 + .../controller/UserDetailControllerTest.java | 3 + .../ValidDocumentControllerTest.java | 432 +++---- .../test/controller/ZoneUtilsRelatedTest.java | 4 +- .../MasterdataIntegrationTest.java | 3 + .../test/service/LocationHierarchyTest.java | 19 +- .../test/service/MasterDataServiceTest.java | 2 + .../masterdata/test/utils/ZoneUtilTest.java | 10 +- .../SpecialCharacterValidatorTest.java | 2 +- .../src/test/resources/application.properties | 22 +- .../src/test/resources/data.sql | 23 +- .../src/test/resources/schema.sql | 6 +- admin/kernel-syncdata-service/Dockerfile | 12 +- admin/kernel-syncdata-service/pom.xml | 183 ++- .../syncdata/SyncDataBootApplication.java | 25 +- .../mosip/kernel/syncdata/config/Config.java | 10 +- .../syncdata/config/SyncDataConfig.java | 16 +- .../config/SyncResponseBodyAdviceConfig.java | 37 +- .../syncdata/config/SyncSwaggerConfig.java | 13 +- .../controller/SyncAuthTokenController.java | 2 +- .../controller/SyncDataController.java | 2 +- .../controller/WebsubCallbackController.java | 6 +- .../kernel/syncdata/dto/ApplicationDto.java | 4 +- .../syncdata/dto/BiometricAttributeDto.java | 4 +- .../kernel/syncdata/dto/BiometricTypeDto.java | 4 +- .../syncdata/dto/DocumentCategoryData.java | 4 +- .../syncdata/dto/DocumentCategoryDto.java | 4 +- .../kernel/syncdata/dto/DocumentTypeDto.java | 4 +- .../mosip/kernel/syncdata/dto/GenderDto.java | 6 +- .../kernel/syncdata/dto/LanguageDto.java | 4 +- .../dto/RegistrationCenterDeviceDto.java | 4 +- .../RegistrationCenterMachineDeviceDto.java | 4 +- ...strationCenterMachineDeviceHistoryDto.java | 9 +- .../dto/RegistrationCenterMachineDto.java | 4 +- .../dto/RegistrationCenterUserDto.java | 4 +- ...gistrationCenterUserMachineMappingDto.java | 4 +- .../mosip/kernel/syncdata/dto/SchemaDto.java | 18 +- .../kernel/syncdata/dto/TemplateTypeDto.java | 4 +- .../dto/UploadPublicKeyRequestDto.java | 2 +- .../kernel/syncdata/dto/ValidDocumentDto.java | 4 +- .../entity/AppAuthenticationMethod.java | 10 +- .../kernel/syncdata/entity/AppDetail.java | 11 +- .../syncdata/entity/AppRolePriority.java | 11 +- .../entity/ApplicantValidDocument.java | 12 +- .../kernel/syncdata/entity/Application.java | 13 +- .../kernel/syncdata/entity/BaseEntity.java | 9 +- .../syncdata/entity/BiometricAttribute.java | 16 +- .../kernel/syncdata/entity/BiometricType.java | 14 +- .../syncdata/entity/BlocklistedWords.java | 8 +- .../mosip/kernel/syncdata/entity/Device.java | 20 +- .../kernel/syncdata/entity/DeviceHistory.java | 15 +- .../syncdata/entity/DeviceProvider.java | 8 +- .../syncdata/entity/DeviceRegister.java | 13 +- .../kernel/syncdata/entity/DeviceService.java | 13 +- .../syncdata/entity/DeviceSpecification.java | 18 +- .../syncdata/entity/DeviceSubTypeDPM.java | 8 +- .../kernel/syncdata/entity/DeviceType.java | 14 +- .../kernel/syncdata/entity/DeviceTypeDPM.java | 13 +- .../syncdata/entity/DocumentCategory.java | 14 +- .../kernel/syncdata/entity/DocumentType.java | 14 +- .../entity/FoundationalTrustProvider.java | 13 +- .../mosip/kernel/syncdata/entity/Holiday.java | 15 +- .../mosip/kernel/syncdata/entity/IdType.java | 13 +- .../kernel/syncdata/entity/Language.java | 13 +- .../kernel/syncdata/entity/Location.java | 15 +- .../syncdata/entity/LocationHierarchy.java | 14 +- .../mosip/kernel/syncdata/entity/Machine.java | 20 +- .../syncdata/entity/MachineHistory.java | 15 +- .../syncdata/entity/MachineSpecification.java | 18 +- .../kernel/syncdata/entity/MachineType.java | 17 +- .../kernel/syncdata/entity/ModuleDetail.java | 13 +- .../syncdata/entity/PermittedLocalConfig.java | 8 +- .../kernel/syncdata/entity/ProcessList.java | 11 +- .../syncdata/entity/ReasonCategory.java | 17 +- .../kernel/syncdata/entity/ReasonList.java | 14 +- .../syncdata/entity/RegisteredDevice.java | 13 +- .../syncdata/entity/RegistrationCenter.java | 22 +- .../entity/RegistrationCenterHistory.java | 22 +- .../entity/RegistrationCenterType.java | 17 +- .../syncdata/entity/ScreenAuthorization.java | 11 +- .../kernel/syncdata/entity/ScreenDetail.java | 10 +- .../kernel/syncdata/entity/SyncJobDef.java | 13 +- .../kernel/syncdata/entity/Template.java | 17 +- .../syncdata/entity/TemplateFileFormat.java | 14 +- .../kernel/syncdata/entity/TemplateType.java | 14 +- .../mosip/kernel/syncdata/entity/Title.java | 14 +- .../syncdata/entity/UserDetailHistoryPk.java | 11 +- .../kernel/syncdata/entity/UserDetails.java | 15 +- .../syncdata/entity/UserDetailsHistory.java | 15 +- .../kernel/syncdata/entity/ValidDocument.java | 17 +- .../entity/id/AppAuthenticationMethodID.java | 9 +- .../syncdata/entity/id/AppRolePriorityID.java | 2 +- .../entity/id/ApplicantValidDocumentID.java | 9 +- .../entity/id/CodeAndLanguageCodeID.java | 4 +- .../id/CodeLangCodeAndRsnCatCodeID.java | 2 +- .../kernel/syncdata/entity/id/GenderID.java | 9 +- .../kernel/syncdata/entity/id/HolidayID.java | 11 +- .../entity/id/IdAndEffectDateTimeID.java | 4 +- .../entity/id/IdAndEffectDtimesID.java | 11 +- .../entity/id/IdAndLanguageCodeID.java | 4 +- .../id/LocationCodeAndLanguageCodeID.java | 4 +- .../entity/id/LocationHierarchyId.java | 4 +- .../entity/id/RegistrationCenterDeviceID.java | 4 +- .../id/RegistrationCenterHistoryID.java | 4 +- ...istrationCenterMachineDeviceHistoryID.java | 11 +- .../id/RegistrationCenterMachineDeviceID.java | 4 +- .../RegistrationCenterMachineHistoryID.java | 4 +- .../id/RegistrationCenterMachineID.java | 9 +- ...egistrationCenterMachineUserHistoryID.java | 4 +- .../id/RegistrationCenterMachineUserID.java | 4 +- .../id/RegistrationCenterUserHistoryID.java | 4 +- .../entity/id/RegistrationCenterUserID.java | 4 +- .../entity/id/ScreenAuthorizationID.java | 7 +- .../syncdata/entity/id/ValidDocumentID.java | 4 +- .../entity/id/WordAndLanguageCodeID.java | 4 +- .../SyncHandlerControllerAdvice.java | 30 +- .../syncdata/httpfilter/CorsFilter.java | 13 +- .../syncdata/httpfilter/ReqResFilter.java | 16 +- .../syncdata/httpfilter/SecurityFilter.java | 22 +- .../service/helper/SyncJobHelperService.java | 20 +- .../service/helper/beans/BaseEntity.java | 4 +- .../impl/SyncAuthTokenServiceImpl.java | 2 +- .../impl/SyncConfigDetailsServiceImpl.java | 2 +- .../utils/SyncMasterDataServiceHelper.java | 102 +- .../websub/PartnerCACertEventSubscriber.java | 3 +- .../kernel/syncdata/test/SyncCacheTest.java | 377 +++--- .../syncdata/test/config/TestConfig.java | 47 +- .../test/config/TestSecurityConfig.java | 36 +- .../controller/IntegratedControllerTest.java | 58 +- .../controller/ServiceIntegratedTest.java | 40 +- .../SyncAuthTokenControllerTest.java | 95 +- .../controller/SyncDataControllerTest.java | 1117 ++++++++--------- .../WebsubCallbackControllerTest.java | 68 +- .../SyncClientSettingsIntegrationTest.java | 587 ++++----- .../integration/SyncDataIntegrationTest.java | 143 +-- .../UserConfigIntegrationTest.java | 50 +- .../test/service/SyncDataServiceTest.java | 239 ++-- .../SyncMasterDataServiceHelperTest.java | 84 +- .../SyncUserDetailsAndRolesServiceTest.java | 175 +-- .../test/service/syncAuthServiceTest.java | 339 +++-- .../test/utils/LocalDateTimeUtilTest.java | 26 +- .../syncdata/test/utils/MapperTest.java | 68 +- admin/pom.xml | 51 +- apitest/Dockerfile | 30 +- apitest/pom.xml | 478 +++---- .../testscripts/PutWithPathParamsAndBody.java | 1 - .../mosip_master/sql/1.2.0-release.sql | 21 + .../mosip_master/sql/1.2.0-revoke.sql | 21 + db_scripts/mosip_master/ddl.sql | 4 +- .../mosip_master/ddl/master-batch-fk.sql | 32 +- .../ddl/master-batch_job_execution.sql | 24 +- .../master-batch_job_execution_context.sql | 9 +- .../ddl/master-batch_job_execution_param.sql | 15 +- .../ddl/master-batch_job_instance.sql | 11 +- .../ddl/master-batch_step_execution.sql | 40 +- .../master-batch_step_execution_context.sql | 9 +- 687 files changed, 5810 insertions(+), 6399 deletions(-) create mode 100644 admin/admin-service/src/main/java/io/mosip/admin/config/AntPathMatcherConfig.java diff --git a/.github/workflows/db-test.yml b/.github/workflows/db-test.yml index 8d3c454576b..653b313edef 100644 --- a/.github/workflows/db-test.yml +++ b/.github/workflows/db-test.yml @@ -34,6 +34,6 @@ jobs: DB_NAME: 'mosip_master' fail-fast: false name: ${{ matrix.DB_NAME }} - uses: mosip/kattu/.github/workflows/db-test.yml@master + uses: mosip/kattu/.github/workflows/db-test.yml@master-java21 with: DB_LOCATION: ${{ matrix.DB_LOCATION}} diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 0f493d9d1bd..8be74f51060 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -18,12 +18,12 @@ on: - release-1* - master - 1.* - - develop + - develop* - MOSIP* jobs: build-maven-admin-services: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: ./admin BUILD_ARTIFACT: admin @@ -37,7 +37,7 @@ jobs: publish_to_nexus: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" needs: build-maven-admin-services - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 with: SERVICE_LOCATION: ./admin secrets: @@ -67,7 +67,7 @@ jobs: BUILD_ARTIFACT: 'admin' fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master + uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -81,7 +81,7 @@ jobs: sonar_analysis: needs: build-maven-admin-services if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: ./admin secrets: @@ -94,7 +94,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-apitest-masterdata: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: ./apitest BUILD_ARTIFACT: apitest-masterdata @@ -108,7 +108,7 @@ jobs: publish_to_nexus_apitest: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" needs: build-maven-apitest-masterdata - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 with: SERVICE_LOCATION: ./apitest secrets: @@ -128,15 +128,15 @@ jobs: SERVICE_LOCATION: apitest BUILD_ARTIFACT: apitest-masterdata-local steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v3 with: - ref: ${{ github.ref }} - java-version: 11 + distribution: 'temurin' + java-version: '21' server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - + - name: Setup the settings file for ossrh server run: echo " ossrh ${{secrets.ossrh_user}} ${{secrets.ossrh_secret}} ossrh true gpg2 ${{secrets.gpg_secret}} allow-snapshots true snapshots-repo https://oss.sonatype.org/content/repositories/snapshots false true releases-repo https://oss.sonatype.org/service/local/staging/deploy/maven2 true false sonar . https://sonarcloud.io false " > $GITHUB_WORKSPACE/settings.xml @@ -182,7 +182,7 @@ jobs: ONLY_DOCKER: true fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master + uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -197,7 +197,7 @@ jobs: sonar_analysis_apitest_masterdata: needs: build-maven-apitest-masterdata if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: ./apitest secrets: diff --git a/admin/admin-service/Dockerfile b/admin/admin-service/Dockerfile index 36d031d9674..57ab4ed0a70 100644 --- a/admin/admin-service/Dockerfile +++ b/admin/admin-service/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11 +FROM eclipse-temurin:21-jre-alpine ARG SOURCE ARG COMMIT_HASH @@ -48,16 +48,16 @@ ARG container_user=mosip ARG container_user_group=mosip # can be passed during Docker build as build time environment for github branch to pickup configuration from. -ARG container_user_uid=1001 +ARG container_user_uid=1002 # can be passed during Docker build as build time environment for github branch to pickup configuration from. ARG container_user_gid=1001 # install packages and create user -RUN apt-get -y update \ -&& apt-get install -y unzip \ -&& groupadd -g ${container_user_gid} ${container_user_group} \ -&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} +RUN apk -q update \ +&& apk add -q unzip wget \ +&& addgroup -g ${container_user_gid} ${container_user_group} \ +&& adduser -s /bin/sh -u ${container_user_uid} -G ${container_user_group} -h /home/${container_user} --disabled-password ${container_user} # set working directory for the user WORKDIR /home/${container_user} @@ -86,8 +86,8 @@ CMD if [ "$is_glowroot_env" = "present" ]; then \ rm -rf glowroot.zip ; \ sed -i 's//kernel-auditmanager-service/g' glowroot/glowroot.properties ; \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -jar -javaagent:glowroot/glowroot.jar -Dloader.path="${loader_path_env}" -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \ + java -jar -javaagent:glowroot/glowroot.jar -Dloader.path="${loader_path_env}" --add-modules=ALL-SYSTEM --add-opens=java.base/java.lang=ALL-UNNAMED -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \ else \ wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -jar -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \ + java -jar -Dloader.path="${loader_path_env}" --add-modules=ALL-SYSTEM --add-opens=java.base/java.lang=ALL-UNNAMED -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" admin-service.jar; \ fi \ No newline at end of file diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml index 06837a7dd89..f7d68f08b19 100644 --- a/admin/admin-service/pom.xml +++ b/admin/admin-service/pom.xml @@ -16,10 +16,36 @@ jar UTF-8 - 2.0.4.RELEASE - 1.5.10 - 1.2.0.1-B1 + 1.8.0 + 1.2.1-SNAPSHOT + 21 + 21 + 3.8.0 + 2.22.0 + 3.0.2 + 3.1.0 + 0.8.11 + 3.7.0.1746 + 2.3 + 2.22.0 + + + + io.mosip.kernel + kernel-bom + 1.2.1-SNAPSHOT + pom + import + + + + + io.mosip.kernel @@ -36,34 +62,21 @@ - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - 2.15.0 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - 2.12.0 - test - org.projectlombok lombok - ${lombok.version} compile commons-io commons-io - 2.10.0 org.apache.poi poi-ooxml - 5.2.2 + 5.2.5 org.springframework.batch.extensions @@ -90,38 +103,33 @@ org.springframework.boot spring-boot-starter-batch - ${spring.boot.version} - + org.postgresql postgresql - ${postgresql.version} + 42.7.2 javax.xml.bind jaxb-api - 2.3.1 com.google.code.gson gson - 2.8.6 + 2.10.1 org.springframework.boot spring-boot-starter-security - ${spring.boot.version} org.springframework.security spring-security-test - ${spring.security.test.version} org.springframework.boot spring-boot-configuration-processor - ${spring.boot.version} provided @@ -131,19 +139,13 @@ org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - org.springframework - spring-webmvc - - + springdoc-openapi-starter-webmvc-ui + 2.5.0 io.mosip.commons commons-packet-manager - 1.2.0.1-SNAPSHOT + ${kernel.version} org.springframework.cloud @@ -178,7 +180,7 @@ org.digibooster.spring.batch spring-batch-security - 1.0.0 + 1.1.0-RELEASE org.slf4j @@ -194,15 +196,48 @@ io.mosip.biometric.util biometrics-util - 1.2.1-SNAPSHOT + ${kernel.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + + + org.hibernate.validator + hibernate-validator + + + org.junit.vintage + junit-vintage-engine + + org.mockito + mockito-core + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + + org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} true ZIP @@ -216,29 +251,42 @@ - - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - get-the-git-infos - - revision - - validate - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} - true - ${project.build.outputDirectory}/service-git.properties - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.basedir}/.git - + ${skipTests} + false + + ${argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + --add-modules=ALL-SYSTEM + --add-opens=java.base/java.lang=ALL-UNNAMED + --illegal-access=permit + @@ -263,7 +311,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + 3.2.3 true ZIP @@ -305,7 +353,7 @@ org.springdoc springdoc-openapi-maven-plugin - 0.2 + 1.3 integration-test diff --git a/admin/admin-service/src/main/java/io/mosip/admin/AdminBootApplication.java b/admin/admin-service/src/main/java/io/mosip/admin/AdminBootApplication.java index ae58ac7ccd3..ae8152d3c2a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/AdminBootApplication.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/AdminBootApplication.java @@ -4,14 +4,15 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -@SpringBootApplication(scanBasePackages = { "io.mosip.admin.*", "io.mosip.commons.*", - "${mosip.auth.adapter.impl.basepackage}", "io.mosip.kernel.idvalidator.rid.*" }) +@SpringBootApplication @EnableAsync +@ComponentScan(value = {"io.mosip.kernel.auth.*","io.mosip.kernel.dataaccess.*","io.mosip.admin.*","io.mosip.commons.*", + "${mosip.auth.adapter.impl.basepackage}", "io.mosip.kernel.idvalidator.rid.*","io.mosip.kernel.biometrics.*","io.mosip.kernel.authcodeflowproxy.*"}) public class AdminBootApplication { public static void main(String[] args) { diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomChunkListener.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomChunkListener.java index a6ccce432c2..157a7ef52a9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomChunkListener.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomChunkListener.java @@ -22,8 +22,8 @@ public void beforeChunk(ChunkContext context) { @Override public void afterChunk(ChunkContext context) { String jobId = (String) context.getStepContext().getJobParameters().get("transactionId"); - int count = context.getStepContext().getStepExecution().getWriteCount(); - bulkUploadTranscationRepository.updateBulkUploadTransactionCount(jobId,count); + long count = context.getStepContext().getStepExecution().getWriteCount(); + bulkUploadTranscationRepository.updateBulkUploadTransactionCount(jobId, Math.toIntExact(count)); } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomExcelRowMapper.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomExcelRowMapper.java index a85570f1103..a9e01c6004e 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomExcelRowMapper.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomExcelRowMapper.java @@ -16,9 +16,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; public class CustomExcelRowMapper extends DefaultPropertyEditorRegistrar implements RowMapper, BeanFactoryAware, InitializingBean { private String name; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomLineMapper.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomLineMapper.java index 1f98a920ca9..39bf560fa12 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomLineMapper.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/CustomLineMapper.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; import java.util.Arrays; import java.util.List; import java.util.Objects; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/JobResultListener.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/JobResultListener.java index 1743ba61b2d..140fb086b85 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/JobResultListener.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/JobResultListener.java @@ -14,7 +14,7 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import java.util.ArrayList; import java.util.List; @@ -38,14 +38,14 @@ public JobResultListener(BulkUploadTranscationRepository bulkUploadTranscationRe @Override public void beforeJob(JobExecution jobExecution) { logger.info("Job started : {}", jobExecution.getJobParameters().getString("transactionId")); - this.jobExecutionSecurityContextListener.fillJobExecutionContext(jobExecution); + this.jobExecutionSecurityContextListener.restoreContext(jobExecution); if(jobExecution.getStepExecutions().isEmpty()) { restoreContext(jobExecution); } else { for(StepExecution stepExecution : jobExecution.getStepExecutions()) { - this.jobExecutionSecurityContextListener.restoreContext(stepExecution); + this.jobExecutionSecurityContextListener.restoreContext(stepExecution.getJobExecution()); } } @@ -82,7 +82,7 @@ else if(failure instanceof FlatFileParseException){ logger.error("Failed to update job status {}", jobId, t); } finally { clearContext(); - this.jobExecutionSecurityContextListener.removeFromJobExecutionContext(jobExecution); + this.jobExecutionSecurityContextListener.clearContext(jobExecution); } } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketJobResultListener.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketJobResultListener.java index b917752b7b6..b2cf1bb57f9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketJobResultListener.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketJobResultListener.java @@ -9,13 +9,10 @@ import org.springframework.batch.core.JobExecutionListener; import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.file.FlatFileParseException; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; -import javax.sql.DataSource; -import java.sql.Types; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -39,14 +36,14 @@ public PacketJobResultListener(BulkUploadTranscationRepository bulkUploadTransca @Override public void beforeJob(JobExecution jobExecution) { logger.info("Job started : {}", jobExecution.getJobParameters().getString("transactionId")); - this.jobExecutionSecurityContextListener.fillJobExecutionContext(jobExecution); + this.jobExecutionSecurityContextListener.restoreContext(jobExecution); if(jobExecution.getStepExecutions().isEmpty()) { restoreContext(jobExecution); } else { for(StepExecution stepExecution : jobExecution.getStepExecutions()) { - this.jobExecutionSecurityContextListener.restoreContext(stepExecution); + this.jobExecutionSecurityContextListener.restoreContext(stepExecution.getJobExecution()); } } } @@ -67,22 +64,22 @@ public void afterJob(JobExecution jobExecution) { }); }); - Optional commitResult = jobExecution.getStepExecutions().stream().map(StepExecution::getCommitCount).findFirst(); - Optional readResult = jobExecution.getStepExecutions().stream().map(StepExecution::getCommitCount).findFirst(); - int readCount = readResult.isPresent() ? readResult.get() : 0; - int commitCount = commitResult.isPresent() ? commitResult.get() : 0; + Optional commitResult = jobExecution.getStepExecutions().stream().map(StepExecution::getCommitCount).findFirst(); + Optional readResult = jobExecution.getStepExecutions().stream().map(StepExecution::getCommitCount).findFirst(); + long readCount = readResult.isPresent() ? readResult.get() : 0; + long commitCount = commitResult.isPresent() ? commitResult.get() : 0; String message = String.format(STATUS_MESSAGE, commitCount, jobExecution.getStatus().toString(), failures.isEmpty() ? "0 Errors" : failures.toString()); auditUtil.setAuditRequestDto(EventEnum.getEventEnumWithValue(EventEnum.BULKDATA_UPLOAD_COMPLETED, jobId + " --> " + message), jobExecution.getJobParameters().getString("username")); - bulkUploadTranscationRepository.updateBulkUploadTransactionPacket(jobId, jobExecution.getExitStatus().getExitCode(), commitCount, message); + bulkUploadTranscationRepository.updateBulkUploadTransactionPacket(jobId, jobExecution.getExitStatus().getExitCode(), Math.toIntExact(commitCount), message); } catch (Throwable t) { logger.error("Failed to update job status {}", jobId, t); } finally { clearContext(); - this.jobExecutionSecurityContextListener.removeFromJobExecutionContext(jobExecution); + this.jobExecutionSecurityContextListener.clearContext(jobExecution); } } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketUploadTasklet.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketUploadTasklet.java index 6df641db773..bb0422eddc1 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketUploadTasklet.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/PacketUploadTasklet.java @@ -9,7 +9,6 @@ import org.springframework.batch.repeat.RepeatStatus; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import org.springframework.web.multipart.MultipartFile; public class PacketUploadTasklet implements Tasklet, InitializingBean { diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/RepositoryListItemWriter.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/RepositoryListItemWriter.java index 8b4698c896a..4d2301b75d9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/RepositoryListItemWriter.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/batch/RepositoryListItemWriter.java @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnitUtil; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnitUtil; import io.mosip.admin.bulkdataupload.entity.*; import io.mosip.admin.config.Mapper; @@ -14,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.batch.core.JobExecutionException; +import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator; import org.springframework.batch.item.adapter.DynamicMethodInvocationException; @@ -66,13 +67,14 @@ public void setRepoBeanName(String repoBeanName) { this.repoBeanName = repoBeanName; } - public void write(List items) throws Exception { - if(!CollectionUtils.isEmpty(items)) { + @Override + public void write(Chunk items) throws Exception { + if(!items.isEmpty()) { this.doWrite(items); } } - protected void doWrite(List items) throws Exception { + protected void doWrite(Chunk items) throws Exception { LOGGER.info("Writing to the repository with " + items.size() + " items."); try { BaseRepository baseRepository = (BaseRepository) applicationContext.getBean(this.repoBeanName); @@ -212,4 +214,5 @@ private MethodInvoker createMethodInvoker(Object targetObject, String targetMeth invoker.setTargetMethod(targetMethod); return invoker; } + } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/dto/MachineRegistrationCenterDto.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/dto/MachineRegistrationCenterDto.java index d8938f77d8e..82014fcc3b6 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/dto/MachineRegistrationCenterDto.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/dto/MachineRegistrationCenterDto.java @@ -6,8 +6,8 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; /** * diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantUserDetailsEntity.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantUserDetailsEntity.java index 053ca5fb964..d1aea8a4cfc 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantUserDetailsEntity.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantUserDetailsEntity.java @@ -3,7 +3,7 @@ import lombok.Data; import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDate; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantValidDocument.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantValidDocument.java index 1f745c756ff..bcc3b5a242d 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantValidDocument.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ApplicantValidDocument.java @@ -2,14 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.ApplicantValidDocumentId; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Application.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Application.java index b0adb08b1d0..662a3575ab3 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Application.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Application.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BaseEntity.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BaseEntity.java index 89da94efe8a..03668a02072 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BaseEntity.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BaseEntity.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricAttribute.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricAttribute.java index cb6b86d0ee3..99c12b35182 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricAttribute.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricAttribute.java @@ -2,16 +2,16 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricType.java index 49bc79e92bc..488e50eca9b 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BiometricType.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BlocklistedWords.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BlocklistedWords.java index eb56c2a3f69..f0c250bc346 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BlocklistedWords.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BlocklistedWords.java @@ -6,10 +6,10 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BulkUploadTranscation.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BulkUploadTranscation.java index 4a26df528fc..2b5df8eca54 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BulkUploadTranscation.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/BulkUploadTranscation.java @@ -4,11 +4,11 @@ import java.time.LocalDateTime; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DaysOfWeek.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DaysOfWeek.java index 7dd781eead4..5c12d0c6eb9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DaysOfWeek.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DaysOfWeek.java @@ -1,15 +1,12 @@ package io.mosip.admin.bulkdataupload.entity; import java.io.Serializable; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.WeekDayId; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Device.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Device.java index 98b7ac587f2..1870da74fc3 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Device.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Device.java @@ -3,18 +3,18 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceHistory.java index f458aa74dd0..0d896edb73c 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceHistory.java @@ -3,13 +3,13 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.IdAndEffectDateTimeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProvider.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProvider.java index 7345335644c..7087014c637 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProvider.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProvider.java @@ -1,9 +1,9 @@ package io.mosip.admin.bulkdataupload.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProviderHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProviderHistory.java index 4c6bbb3df0c..2959f0e9e3d 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProviderHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceProviderHistory.java @@ -2,10 +2,10 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegister.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegister.java index d5f80e7baa3..4e5c0af2f4a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegister.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegister.java @@ -2,10 +2,10 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegisterHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegisterHistory.java index 9614477479e..df7ccdeb401 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegisterHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceRegisterHistory.java @@ -2,12 +2,12 @@ import java.time.LocalDateTime; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.DeviceRegisterHistoryId; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceSpecification.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceSpecification.java index 07f3b85a57f..ff202e52dda 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceSpecification.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceSpecification.java @@ -2,17 +2,17 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceType.java index 05b757d4fc3..bad5e3702db 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DeviceType.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentCategory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentCategory.java index 6fdbf40cda5..4d9042d4159 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentCategory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentCategory.java @@ -2,14 +2,14 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentType.java index 258618d0786..16b722dd4ef 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DocumentType.java @@ -2,14 +2,14 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DynamicField.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DynamicField.java index a9ca1c5d1a7..90c5137aa19 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DynamicField.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/DynamicField.java @@ -1,9 +1,9 @@ package io.mosip.admin.bulkdataupload.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ExceptionalHoliday.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ExceptionalHoliday.java index 80c7e665c99..92765e0f354 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ExceptionalHoliday.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ExceptionalHoliday.java @@ -3,11 +3,11 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.ExcptionalHolidayId; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProvider.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProvider.java index c02e3312f1f..b1557b4dbc0 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProvider.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProvider.java @@ -5,10 +5,10 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProviderHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProviderHistory.java index 3fb8c19c13a..e55d40e6489 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProviderHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/FoundationalTrustProviderHistory.java @@ -6,10 +6,10 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Gender.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Gender.java index 72c4e7bb60d..29d04739283 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Gender.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Gender.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Holiday.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Holiday.java index 6f799310b13..57c59b24522 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Holiday.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Holiday.java @@ -3,16 +3,16 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; //github.com/mosip/mosip.git -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.HolidayID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdType.java index 206c695e5e0..35feac58a45 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdType.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdentitySchema.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdentitySchema.java index f0f22f048ef..e1f6329f103 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdentitySchema.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IdentitySchema.java @@ -2,10 +2,10 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IndividualType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IndividualType.java index 497125b4e78..88d059c9fc6 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IndividualType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/IndividualType.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Language.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Language.java index 7d6cfa92a3a..21a1b8ad9c0 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Language.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Language.java @@ -2,10 +2,10 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Location.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Location.java index 51e5b73b6e1..eb5546875bf 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Location.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Location.java @@ -3,13 +3,13 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/LocationHierarchy.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/LocationHierarchy.java index 511dcc51050..4cc7abf7295 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/LocationHierarchy.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/LocationHierarchy.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.LocationHierarchyId; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceService.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceService.java index 746343fe32c..c4af7d00c56 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceService.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceService.java @@ -2,13 +2,13 @@ import java.time.LocalDateTime; -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 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 lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceServiceHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceServiceHistory.java index 7d4101d4abb..89e4cdf3177 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceServiceHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MOSIPDeviceServiceHistory.java @@ -3,10 +3,10 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Machine.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Machine.java index 5bf4cf49b97..b6502f510da 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Machine.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Machine.java @@ -3,20 +3,17 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; - -import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineHistory.java index 4bbb7b333cf..b8eb028cccc 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineHistory.java @@ -4,13 +4,13 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.IdAndEffectDateTimeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineSpecification.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineSpecification.java index 4d11f37c7d2..e2124045ea7 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineSpecification.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineSpecification.java @@ -2,17 +2,15 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineType.java index 2bed2b5acee..1b2bc5c549a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/MachineType.java @@ -2,13 +2,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; -import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ModuleDetail.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ModuleDetail.java index 6fc2a0716d0..61f18c2994c 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ModuleDetail.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ModuleDetail.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonCategory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonCategory.java index 1304b03ae6f..6352a8dd782 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonCategory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonCategory.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonList.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonList.java index a645cc1c025..90a489c0e65 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonList.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ReasonList.java @@ -2,14 +2,14 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeLangCodeAndRsnCatCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegExceptionalHoliday.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegExceptionalHoliday.java index 62b088b04d0..8dd383422e0 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegExceptionalHoliday.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegExceptionalHoliday.java @@ -3,11 +3,11 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegExceptionalHolidayID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegWorkingNonWorking.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegWorkingNonWorking.java index b580c1a48e8..91b03ae73c0 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegWorkingNonWorking.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegWorkingNonWorking.java @@ -2,14 +2,14 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegWorkingNonWorkingId; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDevice.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDevice.java index 7c50cf8aa40..5186f7ced6c 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDevice.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDevice.java @@ -2,13 +2,13 @@ import java.time.LocalDateTime; -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 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 lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDeviceHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDeviceHistory.java index 554946c9233..460d816e5ce 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDeviceHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegisteredDeviceHistory.java @@ -2,10 +2,10 @@ import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenter.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenter.java index 77cbe8dbde4..18e6192a6cd 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenter.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenter.java @@ -3,19 +3,19 @@ import java.io.Serializable; import java.time.LocalTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDevice.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDevice.java index 13c0cad4d79..e3fccb64049 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDevice.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDevice.java @@ -2,16 +2,16 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterDeviceID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistory.java index 56cc4ea867b..69172dfeb6f 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistory.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistoryPk.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistoryPk.java index 6e237591b07..f90e3b5138a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistoryPk.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterDeviceHistoryPk.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterHistory.java index 9f1b9a8010d..c4377b05413 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterHistory.java @@ -4,17 +4,17 @@ import java.time.LocalDateTime; import java.time.LocalTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterHistoryID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachine.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachine.java index d99e9493fb5..f3aa009fb70 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachine.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachine.java @@ -2,16 +2,16 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterMachineID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDevice.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDevice.java index 8d233ff4d05..f7c65a3bb0a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDevice.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDevice.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterMachineDeviceID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDeviceHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDeviceHistory.java index 65d63b3f3ba..4aeadbf1c24 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDeviceHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineDeviceHistory.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterMachineDeviceHistoryID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineHistory.java index d5d18a92dfa..96fcfa81522 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterMachineHistory.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterMachineHistoryID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterType.java index dc345de2071..5e81221ecc6 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterType.java @@ -3,15 +3,15 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUser.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUser.java index 8c9dc953453..8ab0d073ff2 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUser.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUser.java @@ -1,10 +1,10 @@ package io.mosip.admin.bulkdataupload.entity; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterUserID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistory.java index b23b75caaa2..8b13341d64e 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistory.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistoryPk.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistoryPk.java index c9b93164c76..5f8f3c297f0 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistoryPk.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserHistoryPk.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachine.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachine.java index f46baef9ed1..89f5cf2b61d 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachine.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachine.java @@ -2,12 +2,12 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterMachineUserID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachineHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachineHistory.java index 5b878e04232..c841f69c237 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachineHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationCenterUserMachineHistory.java @@ -2,13 +2,13 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.RegistrationCenterMachineUserHistoryID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceSubType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceSubType.java index de5f8a4727b..4ff3f3724c9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceSubType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceSubType.java @@ -1,9 +1,9 @@ package io.mosip.admin.bulkdataupload.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceType.java index 3ce88935311..bf6564757c5 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/RegistrationDeviceType.java @@ -1,9 +1,9 @@ package io.mosip.admin.bulkdataupload.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/SchemaDefinition.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/SchemaDefinition.java index 8e47e99b5a1..f3ae00bf7c9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/SchemaDefinition.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/SchemaDefinition.java @@ -1,9 +1,9 @@ package io.mosip.admin.bulkdataupload.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Template.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Template.java index 06bfc02fdac..3c7faf13301 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Template.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Template.java @@ -2,17 +2,17 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.IdAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateFileFormat.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateFileFormat.java index 2660580e589..31c182db687 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateFileFormat.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateFileFormat.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateType.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateType.java index 900bcce6bc5..123532905dd 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateType.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/TemplateType.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Title.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Title.java index 416060135c8..856e02e7fe9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Title.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Title.java @@ -2,13 +2,13 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailHistoryPk.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailHistoryPk.java index 68f77c8a003..abcce351dbe 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailHistoryPk.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailHistoryPk.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetails.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetails.java index 65fb7b92845..aaca3c33305 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetails.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetails.java @@ -3,10 +3,10 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailsHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailsHistory.java index 3f3b2e1bf04..70b2241ea6a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailsHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/UserDetailsHistory.java @@ -3,13 +3,13 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ValidDocument.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ValidDocument.java index e5270e83177..4f3d6cc4b9c 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ValidDocument.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ValidDocument.java @@ -2,17 +2,17 @@ import java.io.Serializable; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.ValidDocumentID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Zone.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Zone.java index 96103ded9b0..0dcf64e40a9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Zone.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/Zone.java @@ -2,11 +2,11 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.CodeAndLanguageCodeID; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUser.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUser.java index a5527d34d62..07ac4efab1e 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUser.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUser.java @@ -2,18 +2,16 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; - -import io.mosip.admin.bulkdataupload.entity.id.ZoneUserId; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; + @EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUserHistory.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUserHistory.java index e18884401d7..d48dc4168a2 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUserHistory.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/ZoneUserHistory.java @@ -3,11 +3,11 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Column; +import jakarta.persistence.Table; import io.mosip.admin.bulkdataupload.entity.id.ZoneUserHistoryId; import lombok.AllArgsConstructor; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ApplicantValidDocumentId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ApplicantValidDocumentId.java index baa38968646..81051f4f1d6 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ApplicantValidDocumentId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ApplicantValidDocumentId.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeAndLanguageCodeID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeAndLanguageCodeID.java index 763e48fc6a3..d8ace9a8669 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeAndLanguageCodeID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeAndLanguageCodeID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeLangCodeAndRsnCatCodeID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeLangCodeAndRsnCatCodeID.java index e337de1e91d..e5afb3f5182 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeLangCodeAndRsnCatCodeID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/CodeLangCodeAndRsnCatCodeID.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/DeviceRegisterHistoryId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/DeviceRegisterHistoryId.java index c02f3b1869b..7b832174c5a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/DeviceRegisterHistoryId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/DeviceRegisterHistoryId.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; +import jakarta.persistence.Column; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ExcptionalHolidayId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ExcptionalHolidayId.java index 4bc54f0584e..9171ad4d095 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ExcptionalHolidayId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ExcptionalHolidayId.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/GenderID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/GenderID.java index 57f2b015002..83b213b0b4b 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/GenderID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/GenderID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/HolidayID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/HolidayID.java index 8477a649eaf..15b461af4d8 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/HolidayID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/HolidayID.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndEffectDateTimeID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndEffectDateTimeID.java index c02b25473c0..8e6c7f5443d 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndEffectDateTimeID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndEffectDateTimeID.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndLanguageCodeID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndLanguageCodeID.java index c03935e9ab6..d61f40525e5 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndLanguageCodeID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/IdAndLanguageCodeID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationCodeAndLanguageCodeID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationCodeAndLanguageCodeID.java index bb724de6678..4b35b7f5e11 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationCodeAndLanguageCodeID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationCodeAndLanguageCodeID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationHierarchyId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationHierarchyId.java index b2b4dc294b3..e73e09dd300 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationHierarchyId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/LocationHierarchyId.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegExceptionalHolidayID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegExceptionalHolidayID.java index 6d8f28e0add..19d3f96c540 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegExceptionalHolidayID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegExceptionalHolidayID.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.time.LocalDate; -import javax.persistence.Column; +import jakarta.persistence.Column; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegWorkingNonWorkingId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegWorkingNonWorkingId.java index e515b6fa9a7..b644d4f261f 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegWorkingNonWorkingId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegWorkingNonWorkingId.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterDeviceID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterDeviceID.java index 46d91ef246f..3495060dc2c 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterDeviceID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterDeviceID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterHistoryID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterHistoryID.java index 9e40954972f..665c2ccc30a 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterHistoryID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterHistoryID.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceHistoryID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceHistoryID.java index 2adfb9cdd44..76fcc2f2750 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceHistoryID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceHistoryID.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceID.java index b82231e5585..1fdf1afb5d2 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineDeviceID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineHistoryID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineHistoryID.java index fc238669924..30f10d4313f 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineHistoryID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineHistoryID.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineID.java index 23ca09e7bad..4d3fb6ee0ab 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserHistoryID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserHistoryID.java index 7e302431bbe..cff8f124fd4 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserHistoryID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserHistoryID.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserID.java index 4473109491d..58a577621e9 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterMachineUserID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterUserID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterUserID.java index b6e976590b2..f55dfdd5ee4 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterUserID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/RegistrationCenterUserID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ValidDocumentID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ValidDocumentID.java index e4a8b7cf971..3f6e9adbe39 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ValidDocumentID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ValidDocumentID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WeekDayId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WeekDayId.java index 5ef1f0c8abd..e9e27302e98 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WeekDayId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WeekDayId.java @@ -2,7 +2,7 @@ import java.io.Serializable; -import javax.persistence.Column; +import jakarta.persistence.Column; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WordAndLanguageCodeID.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WordAndLanguageCodeID.java index f6b7709d4a5..5ea41739b97 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WordAndLanguageCodeID.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/WordAndLanguageCodeID.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserHistoryId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserHistoryId.java index ebfc18f8f9e..b6853fe6011 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserHistoryId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserHistoryId.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserId.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserId.java index ffb47b392a7..ceaba82749c 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserId.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/entity/id/ZoneUserId.java @@ -2,8 +2,8 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/ApplicantValidDocumentRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/ApplicantValidDocumentRepository.java index ed374531148..eba6ed066b5 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/ApplicantValidDocumentRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/ApplicantValidDocumentRepository.java @@ -19,8 +19,8 @@ public interface ApplicantValidDocumentRepository extends BaseRepository { - @Query(value = "SELECT dt.lang_code as document_type_lang_code, dt.code as document_type_code, dt.name as document_type_name, dt.descr as document_type_descr, dc.lang_code as document_cat_lang_code, dc.code as document_cat_code, dc.name as document_cat_name, dc.descr as document_cat_descr, avd.lang_code FROM master.applicant_valid_document avd JOIN master.doc_category dc ON dc.code = avd.doccat_code AND avd.is_active = dc.is_active JOIN master.doc_type dt ON dt.code = avd.doctyp_code AND avd.is_active = dt.is_active AND dc.lang_code = dt.lang_code WHERE avd.apptyp_code = :applicantTypeCode AND dt.lang_code IN :languages AND dc.lang_code IN :languages AND avd.is_active = TRUE", nativeQuery = true) + /*@Query(value = "SELECT dt.lang_code as document_type_lang_code, dt.code as document_type_code, dt.name as document_type_name, dt.descr as document_type_descr, dc.lang_code as document_cat_lang_code, dc.code as document_cat_code, dc.name as document_cat_name, dc.descr as document_cat_descr, avd.lang_code FROM master.applicant_valid_document avd JOIN master.doc_category dc ON dc.code = avd.doccat_code AND avd.is_active = dc.is_active JOIN master.doc_type dt ON dt.code = avd.doctyp_code AND avd.is_active = dt.is_active AND dc.lang_code = dt.lang_code WHERE avd.apptyp_code = :applicantTypeCode AND dt.lang_code IN :languages AND dc.lang_code IN :languages AND avd.is_active = TRUE", nativeQuery = true) List getDocumentCategoryAndTypesForApplicantCode(@Param("applicantTypeCode") String applicantTypeCode, - @Param("languages") List languages); + @Param("languages") List languages);*/ } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/BulkUploadTranscationRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/BulkUploadTranscationRepository.java index 80cd15d7f7e..1ef37f3fac1 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/BulkUploadTranscationRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/BulkUploadTranscationRepository.java @@ -5,13 +5,13 @@ import java.util.List; import java.util.UUID; +import jakarta.transaction.Transactional; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; import io.mosip.admin.bulkdataupload.entity.BulkUploadTranscation; import io.mosip.kernel.core.dataaccess.spi.repository.BaseRepository; @@ -21,8 +21,7 @@ * @author dhanendra * */ -//@Repository -@Transactional +@Repository public interface BulkUploadTranscationRepository extends BaseRepository { @Query("FROM BulkUploadTranscation WHERE id =?1 AND (isDeleted is null OR isDeleted = false) AND isActive = true") @@ -36,15 +35,18 @@ public interface BulkUploadTranscationRepository extends BaseRepository { - @Query("From ExceptionalHoliday where regcntr_id=?1 and lang_code=?2 and (isDeleted = false or isDeleted is null) and isActive = true") + @Query("From ExceptionalHoliday where registrationCenterId=?1 and langCode=?2 and (isDeleted = false or isDeleted is null) and isActive = true") List findAllNonDeletedExceptionalHoliday(String regCenterId, String langcode); } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/HolidayRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/HolidayRepository.java index c55d8d82f0b..ff03040f5e6 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/HolidayRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/HolidayRepository.java @@ -126,7 +126,7 @@ List findHolidayByHolidayIdAndByIsDeletedFalseOrIsDeletedNull(String ho @Query(value = "FROM Holiday where holidayDate = ?1 and (isDeleted = false or isDeleted is null) ") List findHolidayByHolidayDate(LocalDate holidayDate); - @Query(value = "FROM Holiday where holidayDate = ?1 and location_code = ?2 and lang_code=?3 and (isDeleted = false or isDeleted is null) ") + @Query(value = "FROM Holiday where holidayDate = ?1 and locationCode = ?2 and langCode=?3 and (isDeleted = false or isDeleted is null) ") Holiday findHolidayByHolidayDateLocationCodeLangCode(LocalDate holidayDate,String locationCode,String langCode); } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdTypeRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdTypeRepository.java index 02bd5e810fd..dd48acea18e 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdTypeRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdTypeRepository.java @@ -22,6 +22,6 @@ public interface IdTypeRepository extends BaseRepository { * @param languageCode the language code. * @return the list of id types. */ - @Query("FROM IdType WHERE lang_code = ?1 and (isDeleted is null or isDeleted =false) AND isActive = true") + @Query("FROM IdType WHERE langCode = ?1 and (isDeleted is null or isDeleted =false) AND isActive = true") List findByLangCode(String languageCode); } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdentitySchemaRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdentitySchemaRepository.java index 9427d80f958..a046ec58b49 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdentitySchemaRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/IdentitySchemaRepository.java @@ -1,11 +1,6 @@ package io.mosip.admin.bulkdataupload.repositories; -import java.time.LocalDateTime; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import io.mosip.admin.bulkdataupload.entity.IdentitySchema; diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/MOSIPDeviceServiceRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/MOSIPDeviceServiceRepository.java index 53ef5c7fb98..b8c9806de87 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/MOSIPDeviceServiceRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/MOSIPDeviceServiceRepository.java @@ -74,7 +74,7 @@ MOSIPDeviceService findByDeviceDetail(String version, String deviceTypeCode, Str * @param id the id of device * @return the device detail */ - @Query("FROM MOSIPDeviceService d where d.id = ?1 AND (d.isDeleted is null or d.isDeleted = false)") + @Query("FROM MOSIPDeviceService where id = ?1 AND (isDeleted is null or isDeleted = false)") MOSIPDeviceService findByIdAndIsDeletedFalseOrIsDeletedIsNull(String id); } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterMachineRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterMachineRepository.java index 4d0d4f9885d..aa2cf17af5e 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterMachineRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterMachineRepository.java @@ -23,9 +23,9 @@ public interface RegistrationCenterMachineRepository extends BaseRepository { - @Query("FROM RegistrationCenterMachine WHERE registrationCenterMachinePk =?1 and (isDeleted is null or isDeleted =false) and isActive = true") + /*@Query("FROM RegistrationCenterMachine WHERE registrationCenterMachinePk =?1 and (isDeleted is null or isDeleted =false) and isActive = true") Optional findAllNondeletedMappings( - RegistrationCenterMachineID registrationCenterMachinePk); + RegistrationCenterMachineID registrationCenterMachinePk);*/ @Query("FROM RegistrationCenterMachine rm where rm.registrationCenterMachinePk.machineId = ?1 AND (rm.isDeleted is null or rm.isDeleted=false) ") List findByMachineIdAndIsDeletedFalseOrIsDeletedIsNull(String machineId); diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterRepository.java index edd19d6bfba..93856173beb 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterRepository.java @@ -130,7 +130,7 @@ List findRegistrationCentersByLat(@Param("latitude") double * @return the number of id deleted. */ @Modifying - @Query("UPDATE RegistrationCenter r SET r.isDeleted =true , r.deletedDateTime = ?1, r.updatedBy = ?3 WHERE r.id =?2 and (r.isDeleted is null or r.isDeleted =false)") + @Query("UPDATE RegistrationCenter SET isDeleted =true , deletedDateTime = ?1, updatedBy = ?3 WHERE id =?2 and (isDeleted is null or isDeleted =false)") int deleteRegistrationCenter(LocalDateTime deletedDateTime, String id, String updatedBy); /** @@ -164,7 +164,7 @@ List findRegistrationCenterByListOfLocationCode(@Param("code @Query("FROM RegistrationCenter WHERE id= ?1 and (isDeleted is null or isDeleted =false)") List findByRegCenterIdAndIsDeletedFalseOrNull(String id); - @Query("FROM RegistrationCenter WHERE id= ?1 and lang_code=?2 ") + @Query("FROM RegistrationCenter WHERE id= ?1 and langCode=?2 ") List findByRegIdAndLangCode(String id, String langCode); /** @@ -178,7 +178,7 @@ List findRegistrationCenterByListOfLocationCode(@Param("code * decommissioned. * @return the number of registration centers decommissioned. */ - @Query("UPDATE RegistrationCenter rc SET rc.isDeleted = true, rc.isActive = false, rc.updatedBy = ?2, rc.updatedDateTime = ?3, rc.deletedDateTime = ?3 WHERE rc.id = ?1 and (rc.isDeleted is null or rc.isDeleted =false)") + @Query("UPDATE RegistrationCenter SET isDeleted = true, isActive = false, updatedBy = ?2, updatedDateTime = ?3, deletedDateTime = ?3 WHERE id = ?1 and (isDeleted is null or isDeleted =false)") @Modifying int decommissionRegCenter(String regCenterID, String deCommissionedBy, LocalDateTime deCommissionedDateTime); diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterUserMachineHistoryRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterUserMachineHistoryRepository.java index 41de5238143..59592b9b05f 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterUserMachineHistoryRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationCenterUserMachineHistoryRepository.java @@ -20,8 +20,4 @@ @Repository public interface RegistrationCenterUserMachineHistoryRepository extends BaseRepository { - - @Query("FROM RegistrationCenterUserMachineHistory WHERE cntrId =?1 and usrId=?2 and machineId=?3 and effectivetimes <=?4 and (isDeleted is null or isDeleted =false)") - List findByCntrIdAndUsrIdAndMachineIdAndEffectivetimesLessThanEqualAndIsDeletedFalseOrIsDeletedIsNull( - String cntrId, String usrId, String machineId, LocalDateTime effectivetimes); } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationDeviceSubTypeRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationDeviceSubTypeRepository.java index e55a654bcc0..bd9758b4671 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationDeviceSubTypeRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/RegistrationDeviceSubTypeRepository.java @@ -15,7 +15,4 @@ @Repository public interface RegistrationDeviceSubTypeRepository extends BaseRepository { - @Query("FROM RegistrationDeviceSubType d where d.code=?1 AND (d.isDeleted is null OR d.isDeleted = false) AND d.isActive = true") - RegistrationDeviceSubType findByCodeAndIsDeletedFalseorIsDeletedIsNullAndIsActiveTrue(String code); - } diff --git a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/TemplateRepository.java b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/TemplateRepository.java index e0f8ad3324b..9579c3ce4bc 100644 --- a/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/TemplateRepository.java +++ b/admin/admin-service/src/main/java/io/mosip/admin/bulkdataupload/repositories/TemplateRepository.java @@ -36,8 +36,8 @@ public interface TemplateRepository extends BaseRepository { * the code * @return All the {@link Template} */ - @Query("FROM Template WHERE code =?1 AND (isDeleted is null OR isDeleted = false) and isActive = true") - List