From 16dca5c2ec809486fbc55880295b065d910231df Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Wed, 21 May 2025 01:09:43 +0530 Subject: [PATCH 01/18] fix(bug): isNewAbha null issue --- .../java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java | 2 +- .../com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java | 2 +- .../com/wipro/fhir/service/healthID/HealthIDServiceImpl.java | 4 ++-- .../wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java b/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java index 8a0fdef..a3fedc8 100644 --- a/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java +++ b/src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java @@ -76,6 +76,6 @@ public class BenHealthIDMapping { private Timestamp lastModDate; @Transient - private boolean isNewAbha; + private Boolean isNewAbha; } diff --git a/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java b/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java index d79212e..1dd01b4 100644 --- a/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java +++ b/src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java @@ -83,6 +83,6 @@ public interface BenHealthIDMappingRepo extends CrudRepository 0) { for(BenHealthIDMapping healthDetails: healthDetailsList) { String healthIdNumber = healthDetails.getHealthIdNumber(); - boolean isNewAbha = benHealthIDMappingRepo.getIsNewAbha(healthIdNumber); - healthDetails.setNewAbha(isNewAbha); + Boolean isNewAbha = benHealthIDMappingRepo.getIsNewAbha(healthIdNumber); + healthDetails.setIsNewAbha(isNewAbha); healthDetailsWithAbhaList.add(healthDetails); } diff --git a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java index 4ddc4e9..205bb54 100644 --- a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java +++ b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java @@ -211,8 +211,10 @@ public String enrollmentByAadhaar(String request) throws FHIRException { constructHealthIdResponse(healthIDResp, abhaProfileAsJsonObj); healthIDResp.setProviderServiceMapID(loginData.getProviderServiceMapId()); healthIDResp.setCreatedBy(loginData.getCreatedBy()); - if(jsonResponse.get("isNew") != null && jsonResponse.get("isNew").getAsString() == "true") { + if(jsonResponse.get("isNew") != null && (jsonResponse.get("isNew").getAsString() == "true")) { healthIDResp.setIsNewAbha(true); + } else { + healthIDResp.setIsNewAbha(false); } Integer healthIdCount = healthIDRepo.getCountOfHealthIdNumber(healthIDResp.getHealthIdNumber()); HealthIDResponse save = healthIDResp; From 2159bb0ceea04e94dba913e9c4c07e73c353bdbc Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Wed, 21 May 2025 01:20:38 +0530 Subject: [PATCH 02/18] fix: coderabbit suggestions --- .../com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java index 205bb54..e25211d 100644 --- a/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java +++ b/src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java @@ -211,7 +211,7 @@ public String enrollmentByAadhaar(String request) throws FHIRException { constructHealthIdResponse(healthIDResp, abhaProfileAsJsonObj); healthIDResp.setProviderServiceMapID(loginData.getProviderServiceMapId()); healthIDResp.setCreatedBy(loginData.getCreatedBy()); - if(jsonResponse.get("isNew") != null && (jsonResponse.get("isNew").getAsString() == "true")) { + if(jsonResponse.get("isNew") != null && "true".equals(jsonResponse.get("isNew").getAsString())) { healthIDResp.setIsNewAbha(true); } else { healthIDResp.setIsNewAbha(false); From ad4cb574a6a9d72b0a03e4e5f50d9c94ff7de261 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Sat, 24 May 2025 00:21:07 +0530 Subject: [PATCH 03/18] fix: updated ci properties for prod --- src/main/environment/common_ci.properties | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 4498835..4bdf776 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -40,7 +40,7 @@ clientSecret=@env.NDHM_ABHA_CLIENT_SECRET_KEY@ ##Default ABDM Facility ID abdmFacilityId= @env.ABDM_FACILITY_ID@ -ndhmuserAuthenticate=@env.ABDM_HIECM_BASE_URL@/gateway/v0.5/sessions +ndhmuserAuthenticate=@env.ABDM_BASE_URL@/gateway/v0.5/sessions ndhmGenerateOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/mobile/generateOtp ndhmVerifyOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/mobile/verifyOtp ndhmCreateHealthID=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/mobile/createHealthId @@ -57,9 +57,9 @@ abdmcreateHealthIdWithPreVerified= @env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registra ##CareContext Creation API -generateOTPForCareContext=@env.ABDM_HIECM_BASE_URL@/gateway/v0.5/users/auth/init -addCareContext = @env.ABDM_HIECM_BASE_URL@/gateway/v0.5/links/link/add-contexts -validateOTPForCareContext=@env.ABDM_HIECM_BASE_URL@/gateway/v0.5/users/auth/confirm +generateOTPForCareContext=@env.ABDM_BASE_URL@/gateway/v0.5/users/auth/init +addCareContext = @env.ABDM_BASE_URL@/gateway/v0.5/links/link/add-contexts +validateOTPForCareContext=@env.ABDM_BASE_URL@/gateway/v0.5/users/auth/confirm ##ABHA Card API ## Auth init - aadhar / mobile @@ -73,12 +73,12 @@ generateHealthCard=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/health/facility/getPngCa generateHealthIDCard=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/account/getPngCard ## Generate Notify SMS once episode completed -generateABDM_NotifySMS=@env.ABDM_HIECM_BASE_URL@/gateway/v1/patients/sms/notify2 +generateABDM_NotifySMS=@env.ABDM_BASE_URL@/gateway/v1/patients/sms/notify2 ##verifyBio -abdmVerifyBio=@env.ABDM_BASE_URL@/api/v1/registration/aadhaar/verifyBio -abdmGenerateMobileOTP=@env.ABDM_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP -abdmConfirmAadhaarBio=@env.ABDM_BASE_URL@/api/v1/auth/confirmWithAadhaarBio +abdmVerifyBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/verifyBio +abdmGenerateMobileOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP +abdmConfirmAadhaarBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/confirmWithAadhaarBio abdmAccountProfile=@env.ABDM_BASE_URL@/api/v1/account/profile ##ABDM Facility services @@ -86,17 +86,17 @@ getAbdmFacilityServicies= @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/bridge- ##ABDM V3 APIs abdmV3UserAuthenticate = @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/sessions -getAuthCertPublicKey = @env.ABDM_BASE_URL@/abha/api/v3/profile/public/certificate -requestOtpForEnrollment = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/request/otp -abhaEnrollByAadhaar = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/enrol/byAadhaar -printAbhaCard = @env.ABDM_BASE_URL@/abha/api/v3/profile/account/abha-card -abhaLoginRequestOtp = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/request/otp -verifyAbhaLogin = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/verify -abhaProfileLoginVerifyUser = @env.ABDM_BASE_URL@/abha/api/v3/profile/login/verify/user -requestAuthByAbdm = @env.ABDM_BASE_URL@/abha/api/v3/enrollment/auth/byAbdm -webLoginAbhaRequestOtp = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/abha/request/otp -webLoginAbhaVerify = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/abha/verify -webLoginPhrCard = @env.ABDM_BASE_URL@/abha/api/v3/phr/web/login/profile/abha/phr-card +getAuthCertPublicKey = @env.ABDM_ABHA_URL@/abha/api/v3/profile/public/certificate +requestOtpForEnrollment = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/request/otp +abhaEnrollByAadhaar = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/enrol/byAadhaar +printAbhaCard = @env.ABDM_ABHA_URL@/abha/api/v3/profile/account/abha-card +abhaLoginRequestOtp = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/request/otp +verifyAbhaLogin = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify +abhaProfileLoginVerifyUser = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify/user +requestAuthByAbdm = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/auth/byAbdm +webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/request/otp +webLoginAbhaVerify = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/verify +webLoginPhrCard = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/profile/abha/phr-card x-CM-ID=@env.X_CM_ID@ abhaMode=@env.ABHA_MODE@ From ee53b5a81e70dc133b1e7babe6a60db7d145e97f Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Sat, 24 May 2025 01:11:57 +0530 Subject: [PATCH 04/18] fix: updated ci properties for abdm --- src/main/environment/common_ci.properties | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 4bdf776..e0acf3b 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -79,24 +79,24 @@ generateABDM_NotifySMS=@env.ABDM_BASE_URL@/gateway/v1/patients/sms/notify2 abdmVerifyBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/verifyBio abdmGenerateMobileOTP=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/registration/aadhaar/generateMobileOTP abdmConfirmAadhaarBio=@env.ABDM_HEALTH_ID_BASE_URL@/api/v1/auth/confirmWithAadhaarBio -abdmAccountProfile=@env.ABDM_BASE_URL@/api/v1/account/profile +abdmAccountProfile=@env.ABDM_ACCOUNT_ID_BASE_URL@/api/v1/account/profile ##ABDM Facility services getAbdmFacilityServicies= @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/bridge-services ##ABDM V3 APIs abdmV3UserAuthenticate = @env.ABDM_HIECM_BASE_URL@/api/hiecm/gateway/v3/sessions -getAuthCertPublicKey = @env.ABDM_ABHA_URL@/abha/api/v3/profile/public/certificate -requestOtpForEnrollment = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/request/otp -abhaEnrollByAadhaar = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/enrol/byAadhaar -printAbhaCard = @env.ABDM_ABHA_URL@/abha/api/v3/profile/account/abha-card -abhaLoginRequestOtp = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/request/otp -verifyAbhaLogin = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify -abhaProfileLoginVerifyUser = @env.ABDM_ABHA_URL@/abha/api/v3/profile/login/verify/user -requestAuthByAbdm = @env.ABDM_ABHA_URL@/abha/api/v3/enrollment/auth/byAbdm -webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/request/otp -webLoginAbhaVerify = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/abha/verify -webLoginPhrCard = @env.ABDM_PHR_URL@/abha/api/v3/phr/web/login/profile/abha/phr-card +getAuthCertPublicKey = @env.ABDM_ABHA_V3_URL@/v3/profile/public/certificate +requestOtpForEnrollment = @env.ABDM_ABHA_V3_URL@/v3/enrollment/request/otp +abhaEnrollByAadhaar = @env.ABDM_ABHA_V3_URL@/v3/enrollment/enrol/byAadhaar +printAbhaCard = @env.ABDM_ABHA_V3_URL@/v3/profile/account/abha-card +abhaLoginRequestOtp = @env.ABDM_ABHA_V3_URL@/v3/profile/login/request/otp +verifyAbhaLogin = @env.ABDM_ABHA_V3_URL@/v3/profile/login/verify +abhaProfileLoginVerifyUser = @env.ABDM_ABHA_V3_URL@/v3/profile/login/verify/user +requestAuthByAbdm = @env.ABDM_ABHA_V3_URL@/v3/enrollment/auth/byAbdm +webLoginAbhaRequestOtp = @env.ABDM_PHR_URL@/login/abha/request/otp +webLoginAbhaVerify = @env.ABDM_PHR_URL@/login/abha/verify +webLoginPhrCard = @env.ABDM_PHR_URL@/login/profile/abha/phr-card x-CM-ID=@env.X_CM_ID@ abhaMode=@env.ABHA_MODE@ From 97df66fe002ec97b8838a45bca4159b7cf1ed5cf Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 12:32:03 +0530 Subject: [PATCH 05/18] fix: updated fasterxml jackson dependency to fix scheduler issue --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c35711b..8a82c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -133,13 +133,13 @@ com.fasterxml.jackson.core - jackson-databind - 2.17.0-rc1 + jackson-annotations + 2.19.0 com.fasterxml.jackson.core jackson-core - 2.17.0-rc1 + 2.19.0 From d9e9a7d925c98c12baec646d93ea14fd765ad555 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 13:58:03 +0530 Subject: [PATCH 06/18] fix: updated jackson version --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 8a82c9d..c9b852f 100644 --- a/pom.xml +++ b/pom.xml @@ -136,6 +136,11 @@ jackson-annotations 2.19.0 + + com.fasterxml.jackson.core + jackson-databind + 2.19.0 + com.fasterxml.jackson.core jackson-core From 029baf2fef02ef59879c4c3bb75dcc99afb1f3ae Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 14:10:51 +0530 Subject: [PATCH 07/18] fix: removed versioning for jackson --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index c9b852f..dde9daa 100644 --- a/pom.xml +++ b/pom.xml @@ -134,17 +134,14 @@ com.fasterxml.jackson.core jackson-annotations - 2.19.0 com.fasterxml.jackson.core jackson-databind - 2.19.0 com.fasterxml.jackson.core jackson-core - 2.19.0 From dd01b9d61a42222a7a4b493c73df03ae3c43f7db Mon Sep 17 00:00:00 2001 From: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Date: Fri, 30 May 2025 14:35:27 +0530 Subject: [PATCH 08/18] fix: Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f1e4da..dde9daa 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ com.fasterxml.jackson.core - jackson-annotationsjackson-annotations com.fasterxml.jackson.core From 11164d0c95d7c0c6af39feff622f9a18bdd80ce5 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 15:00:55 +0530 Subject: [PATCH 09/18] fix: modified jackson version for java 8 times --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index dde9daa..cb9f553 100644 --- a/pom.xml +++ b/pom.xml @@ -156,6 +156,12 @@ 2.3.0 + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.17.0 + + com.fasterxml.jackson.datatype jackson-datatype-joda From 93ca69ed13e5c9cafbe57c684d09f2539a1b230c Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 30 May 2025 15:40:23 +0530 Subject: [PATCH 10/18] fix: jackson dependency version removal --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index cb9f553..45e3c59 100644 --- a/pom.xml +++ b/pom.xml @@ -159,13 +159,11 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.17.0 com.fasterxml.jackson.datatype jackson-datatype-joda - 2.17.0 From c2bb8ffb35d30c2f01b5b7f5cf3cc44830a8c255 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Tue, 3 Jun 2025 14:20:43 +0530 Subject: [PATCH 11/18] fix: updated jackson properties --- src/main/resources/application.properties | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd90173..642bd76 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,4 @@ + spring.datasource.tomcat.initial-size=5 spring.datasource.tomcat.max-active=30 spring.datasource.tomcat.max-idle=5 @@ -14,6 +15,12 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect spring.jackson.serialization.fail-on-empty-beans=false +# Add these under your existing jackson property +spring.jackson.default-property-inclusion=NON_NULL +spring.jackson.deserialization.fail-on-unknown-properties=false +spring.jackson.serialization.write-dates-as-timestamps=true +spring.jackson.parser.allow-unquoted-field-names=true +spring.jackson.parser.allow-single-quotes=true spring.jpa.hibernate.ddl-auto=none spring.jpa.hibernate.show_sql=true spring.jpa.hibernate.format_sql=true @@ -30,12 +37,12 @@ enableIPValidation=false ## quartz setup - fhir resource - bundle generation -start-FHIR-resource-bundle-scheduler=true +start-FHIR-resource-bundle-scheduler=false cron-scheduler-FHIR-resource-bundle=0 0/5 * * * ? * ## quartz setup - patient profile creation start-FHIR-patient-profile-scheduler=false -cron-scheduler-FHIR-patient-profile=0 0/3 * * * ? * +cron-scheduler-FHIR-patient-profile=0 0/1 * * * ? * start-parsing-atom-feed-scheduler=false cron-scheduler-atom-patient-feed=0 37 15 * * ? * @@ -61,6 +68,3 @@ logging.level.com.iemr.ecd=INFO logging.level.web=INFO logging.level.org.springframework.web=INFO logging.level.org.hibernate=INFO - - - From 1e54fa6ed3142bc81b846ce3bbf2efabc1fb1907 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Tue, 3 Jun 2025 14:34:53 +0530 Subject: [PATCH 12/18] fix: update properties --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 642bd76..e3f3cd8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -37,12 +37,12 @@ enableIPValidation=false ## quartz setup - fhir resource - bundle generation -start-FHIR-resource-bundle-scheduler=false +start-FHIR-resource-bundle-scheduler=true cron-scheduler-FHIR-resource-bundle=0 0/5 * * * ? * ## quartz setup - patient profile creation start-FHIR-patient-profile-scheduler=false -cron-scheduler-FHIR-patient-profile=0 0/1 * * * ? * +cron-scheduler-FHIR-patient-profile=0 0/3 * * * ? * start-parsing-atom-feed-scheduler=false cron-scheduler-atom-patient-feed=0 37 15 * * ? * From 382de2e641ac0c23390e2c3ce2090e63263ea860 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Wed, 4 Jun 2025 13:14:01 +0530 Subject: [PATCH 13/18] fix: removed jackson dependency completely --- pom.xml | 12 ------------ src/main/java/com/wipro/fhir/data/users/User.java | 3 --- 2 files changed, 15 deletions(-) diff --git a/pom.xml b/pom.xml index 45e3c59..e19858c 100644 --- a/pom.xml +++ b/pom.xml @@ -131,18 +131,6 @@ json 20231013 - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - com.google.guava diff --git a/src/main/java/com/wipro/fhir/data/users/User.java b/src/main/java/com/wipro/fhir/data/users/User.java index c31049e..d8b613a 100644 --- a/src/main/java/com/wipro/fhir/data/users/User.java +++ b/src/main/java/com/wipro/fhir/data/users/User.java @@ -2,8 +2,6 @@ import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -15,7 +13,6 @@ @Entity @Table(name = "m_user") @Data -@JsonIgnoreProperties(ignoreUnknown = true) public class User implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From 433f837bcbefedc6c9e40d5229df5147442935c4 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Wed, 4 Jun 2025 16:49:30 +0530 Subject: [PATCH 14/18] fix: added hapi base and modified hapi fhir dependency --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e19858c..6b683a3 100644 --- a/pom.xml +++ b/pom.xml @@ -187,15 +187,20 @@ ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 7.0.2 + 6.10.0 + + + + ca.uhn.hapi + hapi-base + 2.6.0 - ca.uhn.hapi.fhir org.hl7.fhir.utilities - 6.3.6 + 6.5.18 From 111117719fcd7aac6721e9d1438faa86d5c0d84d Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Wed, 4 Jun 2025 22:17:58 +0530 Subject: [PATCH 15/18] fix: added all null checks to fhir bundle --- .../AllergyIntoleranceDataModel.java | 25 +++++----- .../resource_model/AppointmentDataModel.java | 28 ++++++----- .../ConditionDiagnosisDataModel.java | 18 ++++---- .../DiagnosticReportDataModel.java | 36 +++++++-------- .../resource_model/EncounterDataModel.java | 25 ++++------ .../FamilyMemberHistoryDataModel.java | 21 ++++----- .../LabTestAndComponentModel.java | 36 +++++++-------- .../MedicationRequestDataModel.java | 46 +++++++++---------- .../VitalsAnthropometryModel.java | 9 ++-- .../java/com/wipro/fhir/data/users/User.java | 3 ++ 10 files changed, 122 insertions(+), 125 deletions(-) diff --git a/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java index bc520ff..245b90e 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/AllergyIntoleranceDataModel.java @@ -61,19 +61,18 @@ public AllergyIntoleranceDataModel() { } public AllergyIntoleranceDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.allergyStatus = (String) objArr[5]; - this.allergyType = (String) objArr[6]; - this.sctcode = (String) objArr[7]; - this.sctTerm = (String) objArr[8]; - this.createdDate = (Timestamp) objArr[9]; - this.createdBy = (String) objArr[10]; - this.allergicReactionType = (String) objArr[11]; - + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.allergyStatus = objArr[5] != null ? (String) objArr[5] : null; + this.allergyType = objArr[6] != null ? (String) objArr[6] : null; + this.sctcode = objArr[7] != null ? (String) objArr[7] : null; + this.sctTerm = objArr[8] != null ? (String) objArr[8] : null; + this.createdDate = objArr[9] != null ? (Timestamp) objArr[9] : null; + this.createdBy = objArr[10] != null ? (String) objArr[10] : null; + this.allergicReactionType = objArr[11] != null ? (String) objArr[11] : null; } public List getAllergyList(List resultSetList) { diff --git a/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java index 45ebabf..84ca4fe 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/AppointmentDataModel.java @@ -60,21 +60,19 @@ public AppointmentDataModel() { } public AppointmentDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - - this.status = (String) objArr[5]; - this.requestDate = (Timestamp) objArr[6]; - this.userID = (Integer) objArr[7]; - this.sName = (String) objArr[8]; - this.designationID = (Integer) objArr[9]; - this.designationName = (String) objArr[10]; - - this.createdDate = (Timestamp) objArr[11]; - this.createdBy = (String) objArr[12]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.status = objArr[5] != null ? (String) objArr[5] : null; + this.requestDate = objArr[6] != null ? (Timestamp) objArr[6] : null; + this.userID = objArr[7] != null ? (Integer) objArr[7] : null; + this.sName = objArr[8] != null ? (String) objArr[8] : null; + this.designationID = objArr[9] != null ? (Integer) objArr[9] : null; + this.designationName = objArr[10] != null ? (String) objArr[10] : null; + this.createdDate = objArr[11] != null ? (Timestamp) objArr[11] : null; + this.createdBy = objArr[12] != null ? (String) objArr[12] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java index 74c6c3b..8218599 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/ConditionDiagnosisDataModel.java @@ -56,15 +56,15 @@ public ConditionDiagnosisDataModel() { } public ConditionDiagnosisDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.sctTerm = (String) objArr[5]; - this.sctcode = (String) objArr[6]; - this.createdDate = (Timestamp) objArr[7]; - this.createdBy = (String) objArr[8]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.sctTerm = objArr[5] != null ? (String) objArr[5] : null; + this.sctcode = objArr[6] != null ? (String) objArr[6] : null; + this.createdDate = objArr[7] != null ? (Timestamp) objArr[7] : null; + this.createdBy = objArr[8] != null ? (String) objArr[8] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java index 9acae30..989e2a3 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/DiagnosticReportDataModel.java @@ -67,24 +67,24 @@ public DiagnosticReportDataModel() { } public DiagnosticReportDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.procedureID = (Integer) objArr[5]; - this.componentID = (Integer) objArr[6]; - this.procedureName = (String) objArr[7]; - this.testComponentName = (String) objArr[8]; - this.testResultValue = (String) objArr[9]; - this.rangeMin = (BigDecimal) objArr[10]; - this.rangeMax = (BigDecimal) objArr[11]; - this.loincCode = (String) objArr[12]; - this.loincValue = (String) objArr[13]; - this.createdDate = (Timestamp) objArr[14]; - this.createdBy = (String) objArr[15]; - this.remarks = (String) objArr[16]; - this.testResultUnit = (String) objArr[17]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.procedureID = objArr[5] != null ? (Integer) objArr[5] : null; + this.componentID = objArr[6] != null ? (Integer) objArr[6] : null; + this.procedureName = objArr[7] != null ? (String) objArr[7] : null; + this.testComponentName = objArr[8] != null ? (String) objArr[8] : null; + this.testResultValue = objArr[9] != null ? (String) objArr[9] : null; + this.rangeMin = objArr[10] != null ? (BigDecimal) objArr[10] : null; + this.rangeMax = objArr[11] != null ? (BigDecimal) objArr[11] : null; + this.loincCode = objArr[12] != null ? (String) objArr[12] : null; + this.loincValue = objArr[13] != null ? (String) objArr[13] : null; + this.createdDate = objArr[14] != null ? (Timestamp) objArr[14] : null; + this.createdBy = objArr[15] != null ? (String) objArr[15] : null; + this.remarks = objArr[16] != null ? (String) objArr[16] : null; + this.testResultUnit = objArr[17] != null ? (String) objArr[17] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java index cc2385b..4a4ead1 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/EncounterDataModel.java @@ -55,21 +55,16 @@ public EncounterDataModel() { } public EncounterDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - - if (objArr[5] != null) - this.nurseFlag = ((Short) objArr[5]).intValue(); - if (objArr[6] != null) - this.docFlag = ((Short) objArr[6]).intValue(); - if (objArr[7] != null) - this.specialistFlag = ((Short) objArr[7]).intValue(); - - this.createdDate = (Timestamp) objArr[8]; - this.createdBy = (String) objArr[9]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.nurseFlag = objArr[5] != null ? ((Number) objArr[5]).intValue() : null; + this.docFlag = objArr[6] != null ? ((Number) objArr[6]).intValue() : null; + this.specialistFlag = objArr[7] != null ? ((Number) objArr[7]).intValue() : null; + this.createdDate = objArr[8] != null ? (Timestamp) objArr[8] : null; + this.createdBy = objArr[9] != null ? (String) objArr[9] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java index 4c74e3b..38e0af1 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/FamilyMemberHistoryDataModel.java @@ -57,17 +57,16 @@ public FamilyMemberHistoryDataModel() { } public FamilyMemberHistoryDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.familyMembers = (String) objArr[5]; - this.sctcode = (String) objArr[6]; - this.sctTerm = (String) objArr[7]; - this.createdDate = (Timestamp) objArr[8]; - this.createdBy = (String) objArr[9]; - + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.familyMembers = objArr[5] != null ? (String) objArr[5] : null; + this.sctcode = objArr[6] != null ? (String) objArr[6] : null; + this.sctTerm = objArr[7] != null ? (String) objArr[7] : null; + this.createdDate = objArr[8] != null ? (Timestamp) objArr[8] : null; + this.createdBy = objArr[9] != null ? (String) objArr[9] : null; } public List getFamilyMemberHistoryList(List resultSetList) { diff --git a/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java b/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java index 5d4066a..ddd42a7 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/LabTestAndComponentModel.java @@ -67,24 +67,24 @@ public LabTestAndComponentModel() { } public LabTestAndComponentModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - this.procedureID = (Integer) objArr[5]; - this.componentID = (Integer) objArr[6]; - this.procedureName = (String) objArr[7]; - this.testComponentName = (String) objArr[8]; - this.testResultValue = (String) objArr[9]; - this.rangeMin = (BigDecimal) objArr[10]; - this.rangeMax = (BigDecimal) objArr[11]; - this.loincCode = (String) objArr[12]; - this.loincValue = (String) objArr[13]; - this.createdDate = (Timestamp) objArr[14]; - this.createdBy = (String) objArr[15]; - this.remarks = (String) objArr[16]; - this.testResultUnit = (String) objArr[17]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + this.procedureID = objArr[5] != null ? (Integer) objArr[5] : null; + this.componentID = objArr[6] != null ? (Integer) objArr[6] : null; + this.procedureName = objArr[7] != null ? (String) objArr[7] : null; + this.testComponentName = objArr[8] != null ? (String) objArr[8] : null; + this.testResultValue = objArr[9] != null ? (String) objArr[9] : null; + this.rangeMin = objArr[10] != null ? (BigDecimal) objArr[10] : null; + this.rangeMax = objArr[11] != null ? (BigDecimal) objArr[11] : null; + this.loincCode = objArr[12] != null ? (String) objArr[12] : null; + this.loincValue = objArr[13] != null ? (String) objArr[13] : null; + this.createdDate = objArr[14] != null ? (Timestamp) objArr[14] : null; + this.createdBy = objArr[15] != null ? (String) objArr[15] : null; + this.remarks = objArr[16] != null ? (String) objArr[16] : null; + this.testResultUnit = objArr[17] != null ? (String) objArr[17] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java b/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java index 401be24..3dbfdd5 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/MedicationRequestDataModel.java @@ -79,29 +79,29 @@ public MedicationRequestDataModel() { } public MedicationRequestDataModel(Object[] objArr) { - this.id = BigInteger.valueOf((long) objArr[0]); - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[1]); - this.visitCode = BigInteger.valueOf((long) objArr[2]); - this.providerServiceMapID = (Integer) objArr[3]; - this.vanID = (Integer) objArr[4]; - - this.drugForm = (String) objArr[5]; - this.genericDrugName = (String) objArr[6]; - this.drugStrength = (String) objArr[7]; - this.drugDose = (String) objArr[8]; - this.drugRoute = (String) objArr[9]; - this.drugFrequency = (String) objArr[10]; - - this.duration = (String) objArr[11]; - this.durationUnit = (String) objArr[12]; - - this.instructions = (String) objArr[13]; - this.qtyPrescribed = (Integer) objArr[14]; - - this.snomedCTCodeDrug = (String) objArr[15]; - this.snomedCTTermDrug = (String) objArr[16]; - this.createdDate = (Timestamp) objArr[17]; - this.createdBy = (String) objArr[18]; + this.id = objArr[0] != null ? BigInteger.valueOf(((Number) objArr[0]).longValue()) : null; + this.beneficiaryRegID = objArr[1] != null ? BigInteger.valueOf(((Number) objArr[1]).longValue()) : null; + this.visitCode = objArr[2] != null ? BigInteger.valueOf(((Number) objArr[2]).longValue()) : null; + this.providerServiceMapID = objArr[3] != null ? (Integer) objArr[3] : null; + this.vanID = objArr[4] != null ? (Integer) objArr[4] : null; + + this.drugForm = objArr[5] != null ? (String) objArr[5] : null; + this.genericDrugName = objArr[6] != null ? (String) objArr[6] : null; + this.drugStrength = objArr[7] != null ? (String) objArr[7] : null; + this.drugDose = objArr[8] != null ? (String) objArr[8] : null; + this.drugRoute = objArr[9] != null ? (String) objArr[9] : null; + this.drugFrequency = objArr[10] != null ? (String) objArr[10] : null; + + this.duration = objArr[11] != null ? (String) objArr[11] : null; + this.durationUnit = objArr[12] != null ? (String) objArr[12] : null; + + this.instructions = objArr[13] != null ? (String) objArr[13] : null; + this.qtyPrescribed = objArr[14] != null ? (Integer) objArr[14] : null; + + this.snomedCTCodeDrug = objArr[15] != null ? (String) objArr[15] : null; + this.snomedCTTermDrug = objArr[16] != null ? (String) objArr[16] : null; + this.createdDate = objArr[17] != null ? (Timestamp) objArr[17] : null; + this.createdBy = objArr[18] != null ? (String) objArr[18] : null; } diff --git a/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java b/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java index 01dc0a5..f37b660 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java @@ -61,9 +61,12 @@ public VitalsAnthropometryModel() { public VitalsAnthropometryModel(Object[] objArr) { - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[0]); - this.providerServiceMapID = (Integer) objArr[1]; - this.visitCode = BigInteger.valueOf((long) objArr[2]); + if (objArr[0] != null) + this.beneficiaryRegID = BigInteger.valueOf((long) objArr[0]); + if (objArr[1] != null) + this.providerServiceMapID = (Integer) objArr[1]; + if (objArr[2] != null) + this.visitCode = BigInteger.valueOf((long) objArr[2]); if (objArr[3] != null) this.Temperature = (BigDecimal) objArr[3]; if (objArr[4] != null) diff --git a/src/main/java/com/wipro/fhir/data/users/User.java b/src/main/java/com/wipro/fhir/data/users/User.java index d8b613a..c31049e 100644 --- a/src/main/java/com/wipro/fhir/data/users/User.java +++ b/src/main/java/com/wipro/fhir/data/users/User.java @@ -2,6 +2,8 @@ import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -13,6 +15,7 @@ @Entity @Table(name = "m_user") @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class User implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From f27d5315589e335c92c0acc5547ec68a974ca0ba Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Wed, 4 Jun 2025 22:46:55 +0530 Subject: [PATCH 16/18] fix: missed null checks --- .../data/resource_model/VitalsAnthropometryModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java b/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java index f37b660..f477aef 100644 --- a/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java +++ b/src/main/java/com/wipro/fhir/data/resource_model/VitalsAnthropometryModel.java @@ -62,7 +62,7 @@ public VitalsAnthropometryModel() { public VitalsAnthropometryModel(Object[] objArr) { if (objArr[0] != null) - this.beneficiaryRegID = BigInteger.valueOf((long) objArr[0]); + this.beneficiaryRegID = BigInteger.valueOf(((Number) objArr[0]).longValue()); if (objArr[1] != null) this.providerServiceMapID = (Integer) objArr[1]; if (objArr[2] != null) @@ -90,8 +90,10 @@ public VitalsAnthropometryModel(Object[] objArr) { this.height_cm = (BigDecimal) objArr[15]; if (objArr[16] != null) this.BMI = (BigDecimal) objArr[16]; - this.createdDate = (Timestamp) objArr[17]; - this.createdBy = (String) objArr[18]; + if (objArr[16] != null) + this.createdDate = (Timestamp) objArr[17]; + if (objArr[16] != null) + this.createdBy = (String) objArr[18]; } From 12bc6c22f3f1aa97ce9e9e16ffd17ba961126189 Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Thu, 5 Jun 2025 17:22:29 +0530 Subject: [PATCH 17/18] fix: adding jackson properties --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index 6b683a3..d11086a 100644 --- a/pom.xml +++ b/pom.xml @@ -183,6 +183,22 @@ spring-boot-starter-mail + + com.fasterxml.jackson.core + jackson-core + 2.16.1 + + + com.fasterxml.jackson.core + jackson-databind + 2.16.1 + + + com.fasterxml.jackson.core + jackson-annotations + 2.16.1 + + ca.uhn.hapi.fhir From bbd8733640bf2f22dbbcc93eae70c0180d687c0c Mon Sep 17 00:00:00 2001 From: KA40094929 Date: Fri, 6 Jun 2025 22:18:27 +0530 Subject: [PATCH 18/18] fix: jackson versions modification --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d11086a..06d66d8 100644 --- a/pom.xml +++ b/pom.xml @@ -186,17 +186,17 @@ com.fasterxml.jackson.core jackson-core - 2.16.1 + 2.14.2 com.fasterxml.jackson.core jackson-databind - 2.16.1 + 2.14.2 com.fasterxml.jackson.core jackson-annotations - 2.16.1 + 2.14.2