From 80176669b08fa964ad06c24dbe754730462c3f78 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Fri, 24 Jan 2025 12:41:21 +0530 Subject: [PATCH 1/3] Removing IndividualBulkResponse class and importing from library --- .../egov/hrms/service/IndividualService.java | 2 +- .../web/models/IndividualBulkResponse.java | 54 ------------------- .../controllers/IndividualApiController.java | 2 +- .../individual/IndividualBulkResponse.java | 54 ------------------- 4 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java delete mode 100644 health-services/individual/src/main/java/org/egov/individual/web/models/individual/IndividualBulkResponse.java diff --git a/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java b/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java index 40482914921..f5b1fbc4984 100644 --- a/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java +++ b/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java @@ -22,6 +22,7 @@ import org.egov.common.models.individual.Gender; import org.egov.common.models.individual.Identifier; import org.egov.common.models.individual.Individual; +import org.egov.common.models.individual.IndividualBulkResponse; import org.egov.common.models.individual.IndividualRequest; import org.egov.common.models.individual.IndividualResponse; import org.egov.common.models.individual.Name; @@ -32,7 +33,6 @@ import org.egov.hrms.web.contract.User; import org.egov.hrms.web.contract.UserRequest; import org.egov.hrms.web.contract.UserResponse; -import org.egov.hrms.web.models.IndividualBulkResponse; import org.egov.hrms.web.models.IndividualSearch; import org.egov.hrms.web.models.IndividualSearchRequest; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java b/core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java deleted file mode 100644 index 845d6cb72d0..00000000000 --- a/core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.egov.hrms.web.models; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.egov.common.contract.response.ResponseInfo; -import org.egov.common.models.individual.Individual; -import org.springframework.validation.annotation.Validated; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - -/** - * IndividualBulkResponse - */ -@Validated - - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonIgnoreProperties(ignoreUnknown = true) -public class IndividualBulkResponse { - - @JsonProperty("ResponseInfo") - @NotNull - @Valid - private ResponseInfo responseInfo = null; - - @JsonProperty("TotalCount") - @Valid - @Builder.Default - private Long totalCount = 0L; - - @JsonProperty("Individual") - @Valid - private List individual = null; - - public IndividualBulkResponse addIndividualItem(Individual individualItem) { - if (this.individual == null) { - this.individual = new ArrayList<>(); - } - this.individual.add(individualItem); - return this; - } - -} diff --git a/health-services/individual/src/main/java/org/egov/individual/web/controllers/IndividualApiController.java b/health-services/individual/src/main/java/org/egov/individual/web/controllers/IndividualApiController.java index ab4ea1a26bc..aeb7668e419 100644 --- a/health-services/individual/src/main/java/org/egov/individual/web/controllers/IndividualApiController.java +++ b/health-services/individual/src/main/java/org/egov/individual/web/controllers/IndividualApiController.java @@ -12,6 +12,7 @@ import org.egov.common.models.core.URLParams; import org.egov.common.models.individual.Individual; import org.egov.common.models.individual.IndividualBulkRequest; +import org.egov.common.models.individual.IndividualBulkResponse; import org.egov.common.models.individual.IndividualRequest; import org.egov.common.models.individual.IndividualResponse; import org.egov.common.models.individual.IndividualSearchRequest; @@ -19,7 +20,6 @@ import org.egov.common.utils.ResponseInfoFactory; import org.egov.individual.config.IndividualProperties; import org.egov.individual.service.IndividualService; -import org.egov.individual.web.models.individual.IndividualBulkResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/health-services/individual/src/main/java/org/egov/individual/web/models/individual/IndividualBulkResponse.java b/health-services/individual/src/main/java/org/egov/individual/web/models/individual/IndividualBulkResponse.java deleted file mode 100644 index 7027f40974a..00000000000 --- a/health-services/individual/src/main/java/org/egov/individual/web/models/individual/IndividualBulkResponse.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.egov.individual.web.models.individual; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.egov.common.contract.response.ResponseInfo; -import org.egov.common.models.individual.Individual; -import org.springframework.validation.annotation.Validated; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - -/** - * IndividualResponse - */ -@Validated - - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -@JsonIgnoreProperties(ignoreUnknown = true) -public class IndividualBulkResponse { - - @JsonProperty("ResponseInfo") - @NotNull - @Valid - private ResponseInfo responseInfo = null; - - @JsonProperty("TotalCount") - @Valid - @Builder.Default - private Long totalCount = 0L; - - @JsonProperty("Individual") - @Valid - private List individual = null; - - public IndividualBulkResponse addIndividualItem(Individual individualItem) { - if (this.individual == null) { - this.individual = new ArrayList<>(); - } - this.individual.add(individualItem); - return this; - } - -} From 300a11de57df0d3ee522209433f1ac20d2fd5907 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Fri, 24 Jan 2025 16:05:50 +0530 Subject: [PATCH 2/3] updating version for org.egov.services.services-common --- core-services/egov-hrms/pom.xml | 4 ++-- .../main/java/org/egov/hrms/service/IndividualService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-hrms/pom.xml b/core-services/egov-hrms/pom.xml index ff717d747cc..85cc92b51e6 100644 --- a/core-services/egov-hrms/pom.xml +++ b/core-services/egov-hrms/pom.xml @@ -48,7 +48,7 @@ org.egov.services services-common - 1.1.1-SNAPSHOT + 2.9.0-SNAPSHOT commons-lang @@ -101,7 +101,7 @@ org.egov.common health-services-models - 1.0.12-SNAPSHOT + 1.0.22-SNAPSHOT compile diff --git a/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java b/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java index f5b1fbc4984..26f5199e2e3 100644 --- a/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java +++ b/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java @@ -11,11 +11,11 @@ import java.util.UUID; import java.util.stream.Collectors; -import digit.models.coremodels.AuditDetails; -import digit.models.coremodels.user.enums.UserType; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.egov.common.contract.models.AuditDetails; import org.egov.common.contract.request.RequestInfo; +import org.egov.common.contract.user.enums.UserType; import org.egov.common.models.core.Role; import org.egov.common.models.individual.Address; import org.egov.common.models.individual.AddressType; From e7a51b86a2b98ab13af1726ed4f4e9be5028c050 Mon Sep 17 00:00:00 2001 From: Tanishi Goyal Date: Fri, 24 Jan 2025 17:17:38 +0530 Subject: [PATCH 3/3] using IndividualBulkResponse class in egov-hrms --- core-services/egov-hrms/pom.xml | 4 +- .../egov/hrms/service/IndividualService.java | 6 +-- .../web/models/IndividualBulkResponse.java | 54 +++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java diff --git a/core-services/egov-hrms/pom.xml b/core-services/egov-hrms/pom.xml index 85cc92b51e6..ff717d747cc 100644 --- a/core-services/egov-hrms/pom.xml +++ b/core-services/egov-hrms/pom.xml @@ -48,7 +48,7 @@ org.egov.services services-common - 2.9.0-SNAPSHOT + 1.1.1-SNAPSHOT commons-lang @@ -101,7 +101,7 @@ org.egov.common health-services-models - 1.0.22-SNAPSHOT + 1.0.12-SNAPSHOT compile diff --git a/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java b/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java index 26f5199e2e3..40482914921 100644 --- a/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java +++ b/core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java @@ -11,18 +11,17 @@ import java.util.UUID; import java.util.stream.Collectors; +import digit.models.coremodels.AuditDetails; +import digit.models.coremodels.user.enums.UserType; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.egov.common.contract.models.AuditDetails; import org.egov.common.contract.request.RequestInfo; -import org.egov.common.contract.user.enums.UserType; import org.egov.common.models.core.Role; import org.egov.common.models.individual.Address; import org.egov.common.models.individual.AddressType; import org.egov.common.models.individual.Gender; import org.egov.common.models.individual.Identifier; import org.egov.common.models.individual.Individual; -import org.egov.common.models.individual.IndividualBulkResponse; import org.egov.common.models.individual.IndividualRequest; import org.egov.common.models.individual.IndividualResponse; import org.egov.common.models.individual.Name; @@ -33,6 +32,7 @@ import org.egov.hrms.web.contract.User; import org.egov.hrms.web.contract.UserRequest; import org.egov.hrms.web.contract.UserResponse; +import org.egov.hrms.web.models.IndividualBulkResponse; import org.egov.hrms.web.models.IndividualSearch; import org.egov.hrms.web.models.IndividualSearchRequest; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java b/core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java new file mode 100644 index 00000000000..845d6cb72d0 --- /dev/null +++ b/core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualBulkResponse.java @@ -0,0 +1,54 @@ +package org.egov.hrms.web.models; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.egov.common.contract.response.ResponseInfo; +import org.egov.common.models.individual.Individual; +import org.springframework.validation.annotation.Validated; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; + +/** + * IndividualBulkResponse + */ +@Validated + + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@JsonIgnoreProperties(ignoreUnknown = true) +public class IndividualBulkResponse { + + @JsonProperty("ResponseInfo") + @NotNull + @Valid + private ResponseInfo responseInfo = null; + + @JsonProperty("TotalCount") + @Valid + @Builder.Default + private Long totalCount = 0L; + + @JsonProperty("Individual") + @Valid + private List individual = null; + + public IndividualBulkResponse addIndividualItem(Individual individualItem) { + if (this.individual == null) { + this.individual = new ArrayList<>(); + } + this.individual.add(individualItem); + return this; + } + +}