Merge pull request #3 from smartSenseSolutions/fix/version-upgrade-relevant-changes

fix: version upgrade changes

Author: nitin-vavdiya

compose.yaml

@@ -13,7 +13,7 @@ services:
 
   keycloak:
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://http://0.0.0.0:28080/auth/"]
+      test: ["CMD", "curl", "-f", "http://0.0.0.0:28080/auth/"]
       interval: 5s
       timeout: 2s
       retries: 15

gradle.properties

@@ -1,13 +1,13 @@
 appGroup=ss.mod.demo
-springBootVersion=3.2.4
-springDependencyManagementVersion=1.1.4
-springCloudVersion=2023.0.0
-openApiVersion=2.4.0
-commonsDaoVersion=0.0.11
-jacksonVersion=2.17.0
+springBootVersion=3.3.0
+springDependencyManagementVersion=1.1.5
+springCloudVersion=2023.0.1
+openApiVersion=2.5.0
+commonsDaoVersion=1.0.0
+jacksonVersion=2.17.1
 #Test property
-jacocoVersion=0.8.11
-testContainerVersion=1.19.7
-keycloakTestContainerVersion=3.3.0
-keycloakAdminClientVersion=24.0.2
-liquibaseVersion=4.26.0
+jacocoVersion=0.8.12
+testContainerVersion=1.19.8
+keycloakTestContainerVersion=3.3.1
+keycloakAdminClientVersion=24.0.4
+liquibaseVersion=4.28.0

ss-api/src/main/java/ss/mod/demo/api/model/request/FilterWrapper.java

@@ -1,15 +1,16 @@
 package ss.mod.demo.api.model.response;
 
 
-import com.smartsensesolutions.java.commons.sort.Sort;
+import com.smartsensesolutions.commons.dao.filter.FilterRequest;
+import com.smartsensesolutions.commons.dao.filter.sort.Sort;
 import lombok.*;
 import org.springframework.data.domain.Page;
-import ss.mod.demo.api.model.request.FilterWrapper;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Common response format.
@@ -30,22 +31,22 @@ public class PageResponse<T> implements Serializable {
     private Iterable<T> content;
     private Pageable pageable;
 
-    public static <C> PageResponse<C> of(Collection<C> data, Pageable pageable, Sort sort) {
+    public static <C> PageResponse<C> of(Collection<C> data, Pageable pageable, List<Sort> sort) {
         return new PageResponse<>(data, pageable.toBuilder().sort(sort).build());
     }
 
-    public static <C> PageResponse<C> of(Page<C> page, Sort sort) {
+    public static <C> PageResponse<C> of(Page<C> page, List<Sort> sort) {
         return of(page.getContent(), page.getNumber(), page.getNumberOfElements(), page.getSize(), page.getTotalPages(), page.getTotalElements(), sort);
     }
 
-    public static <C> PageResponse<C> of(Iterable<C> content, Integer currentPage, Integer numberOfElement, Integer size, Integer totalPages, Long totalElements, Sort sort) {
+    public static <C> PageResponse<C> of(Iterable<C> content, Integer currentPage, Integer numberOfElement, Integer size, Integer totalPages, Long totalElements, List<Sort> sort) {
         PageResponse<C> page = new PageResponse<>();
         page.content = content;
         page.setPageable(new Pageable(size, totalPages, currentPage, numberOfElement, totalElements, sort));
         return page;
     }
 
-    public static <T> PageResponse<T> getBlank(FilterWrapper filter) {
+    public static <T> PageResponse<T> getBlank(FilterRequest filter) {
         Pageable pageable = Pageable.builder()
                 .totalPages(0)
                 .numberOfElements(0)
@@ -69,6 +70,6 @@ public static class Pageable implements Serializable {
         private int pageNumber;
         private int numberOfElements;
         private long totalElements;
-        private Sort sort;
+        private List<Sort> sort;
     }
-}
+}

ss-api/src/main/java/ss/mod/demo/api/model/response/PageResponse.java

@@ -3,7 +3,7 @@
  */
 package ss.mod.demo.dao.entity;
 
-import com.smartsensesolutions.java.commons.base.entity.BaseEntity;
+import com.smartsensesolutions.commons.dao.base.BaseEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;

ss-dao/src/main/java/ss/mod/demo/dao/entity/BaseAuditEntity.java

@@ -3,7 +3,7 @@
  */
 package ss.mod.demo.dao.repository;
 
-import com.smartsensesolutions.java.commons.base.repository.BaseRepository;
+import com.smartsensesolutions.commons.dao.base.BaseRepository;
 import org.springframework.stereotype.Repository;
 import ss.mod.demo.dao.entity.UserMaster;
 

ss-dao/src/main/java/ss/mod/demo/dao/repository/UserMasterRepository.java

@@ -4,8 +4,8 @@
 package ss.mod.demo.service.entity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.smartsensesolutions.java.commons.base.entity.BaseEntity;
-import lombok.RequiredArgsConstructor;
+import com.smartsensesolutions.commons.dao.base.BaseEntity;
+import com.smartsensesolutions.commons.dao.base.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 
@@ -15,7 +15,7 @@
  * @author Sunil Kanzar
  * @since 14th feb 2024
  */
-public abstract class BaseEntityService<E extends BaseEntity, ID> extends com.smartsensesolutions.java.commons.base.service.BaseService<E, ID> implements ServiceUtil {
+public abstract class BaseEntityService<E extends BaseEntity, ID> extends BaseService<E, ID> implements ServiceUtil {
 
     @Autowired
     private ObjectMapper objectMapper;

ss-service-impl/src/main/java/ss/mod/demo/service/entity/BaseEntityService.java

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.smartsensesolutions.java.commons.FilterRequest;
+import com.smartsensesolutions.commons.dao.filter.FilterRequest;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.data.domain.Page;

ss-service-impl/src/main/java/ss/mod/demo/service/entity/ServiceUtil.java

@@ -3,9 +3,8 @@
  */
 package ss.mod.demo.service.entity;
 
-import com.smartsensesolutions.java.commons.base.repository.BaseRepository;
-import com.smartsensesolutions.java.commons.specification.SpecificationUtil;
-import lombok.AllArgsConstructor;
+import com.smartsensesolutions.commons.dao.base.BaseRepository;
+import com.smartsensesolutions.commons.dao.specification.SpecificationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import ss.mod.demo.api.constant.ContMessage;

ss-service-impl/src/main/java/ss/mod/demo/service/entity/UserMasterService.java

@@ -3,12 +3,11 @@
  */
 package ss.mod.demo.service.impl;
 
-import lombok.AllArgsConstructor;
+import com.smartsensesolutions.commons.dao.filter.FilterRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
-import ss.mod.demo.api.model.request.FilterWrapper;
 import ss.mod.demo.api.model.request.UserRequest;
 import ss.mod.demo.api.model.response.PageResponse;
 import ss.mod.demo.api.model.response.UserResponse;
@@ -41,8 +40,8 @@ public UserResponse createUser(UserRequest userRequest) {
     }
 
     @Override
-    public PageResponse<UserResponse> userFilter(FilterWrapper filterWrapper) {
-        Page<UserMaster> filter = userMasterService.filter(filterWrapper);
-        return toPageResponse(filter, filterWrapper, UserResponse.class);
+    public PageResponse<UserResponse> userFilter(FilterRequest filterRequest) {
+        Page<UserMaster> filter = userMasterService.filter(filterRequest);
+        return toPageResponse(filter, filterRequest, UserResponse.class);
     }
 }