From 1d41b9fa475fb11f7e979dcf735637f3bbf9e941 Mon Sep 17 00:00:00 2001 From: Dhanendra Sahu <60607841+dhanendra06@users.noreply.github.com> Date: Fri, 8 Aug 2025 17:41:51 +0530 Subject: [PATCH] Revert "MOSIP-42206 (#2148)" This reverts commit 68d39ce228b9154e378eca643cb68e06000f5047. --- .github/workflows/push-trigger.yml | 1 - .../stages/demodedupe/DemoDedupe.java | 46 ++++---------- .../demodedupe/DemodedupeProcessor.java | 62 +++++++++---------- .../stages/demodedupe/DemoDedupeTest.java | 3 - registration-processor/pom.xml | 2 +- .../Dockerfile | 2 +- .../packet/storage/dao/PacketInfoDao.java | 50 --------------- .../Dockerfile | 2 +- .../status/dao/RegistrationStatusDao.java | 4 -- .../repositary/RegistrationRepositary.java | 5 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../Dockerfile | 2 +- 17 files changed, 53 insertions(+), 138 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index a28024e23ed..3ad84cd5e62 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -20,7 +20,6 @@ on: - master - 1.* - develop* - - MOSIP* jobs: build-maven-registration: diff --git a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupe.java b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupe.java index 0b4b8388013..22097d73ae7 100644 --- a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupe.java +++ b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupe.java @@ -2,10 +2,7 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import io.mosip.registration.processor.status.dao.RegistrationStatusDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; @@ -40,9 +37,6 @@ public class DemoDedupe { @Autowired private PacketInfoDao packetInfoDao; - @Autowired - private RegistrationStatusDao registrationStatusDao; - /** * Perform dedupe. * @@ -50,7 +44,7 @@ public class DemoDedupe { * the ref id * @return the list */ - /*public List performDedupe(String refId) { + public List performDedupe(String refId) { regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REFERENCEID.toString(), refId, "DemoDedupe::performDedupe()::entry"); @@ -65,37 +59,19 @@ public class DemoDedupe { regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REFERENCEID.toString(), refId, "DemoDedupe::performDedupe()::exit"); return demographicInfoDtos; - }*/ - public List performDedupe(String refId) { - regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REFERENCEID.toString(), refId, - "DemoDedupe::performDedupe()::entry"); - - List applicantDemoDto = packetInfoDao.findDemoById(refId); - - // Collect all unique parameter sets - List params = applicantDemoDto.stream() - .map(dto -> new PacketInfoDao.NameGenderDobLangCode(dto.getName(), dto.getGenderCode(), dto.getDob(), dto.getLangCode())) - .distinct() - .collect(Collectors.toList()); - - // Batch query for all demographic infos matching any of the parameter sets - List infoDtos = packetInfoDao.getAllDemographicInfoDtosBatch(params); + } - List demographicInfoDtos = getAllDemographicInfoDtosWithUin(infoDtos); + private List getAllDemographicInfoDtosWithUin( + List duplicateDemographicDtos) { + List demographicInfoDtosWithUin = new ArrayList<>(); + for (DemographicInfoDto demographicDto : duplicateDemographicDtos) { + if (registrationStatusService.checkUinAvailabilityForRid(demographicDto.getRegId())) { + demographicInfoDtosWithUin.add(demographicDto); + } - regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REFERENCEID.toString(), refId, - "DemoDedupe::performDedupe()::exit"); - return demographicInfoDtos; + } + return demographicInfoDtosWithUin; } - private List getAllDemographicInfoDtosWithUin(List duplicateDemographicDtos) { - List regIds = duplicateDemographicDtos.stream() - .map(DemographicInfoDto::getRegId) - .collect(Collectors.toList()); - List availableUins = registrationStatusDao.getProcessedRegIds(regIds); // new batch method - return duplicateDemographicDtos.stream() - .filter(dto -> availableUins.contains(dto.getRegId())) - .collect(Collectors.toList()); - } } diff --git a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemodedupeProcessor.java b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemodedupeProcessor.java index a8a3dac214c..60d358a67a3 100644 --- a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemodedupeProcessor.java +++ b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemodedupeProcessor.java @@ -579,41 +579,41 @@ private boolean saveDuplicateDtoList(List duplicateDtos, String moduleId = PlatformSuccessMessages.RPR_PKR_DEMO_DE_DUP.getCode(); String moduleName = ModuleName.DEMO_DEDUPE.toString(); - - duplicateDtos.parallelStream().forEach(demographicInfoDto -> { - InternalRegistrationStatusDto potentialMatchRegistrationDto = registrationStatusService - .getRegistrationStatus(demographicInfoDto.getRegId(), - registrationStatusDto.getRegistrationType(), registrationStatusDto.getIteration(), registrationStatusDto.getWorkflowInstanceId()); - if (potentialMatchRegistrationDto.getLatestTransactionStatusCode() - .equalsIgnoreCase(RegistrationTransactionStatusCode.REPROCESS.toString()) - || potentialMatchRegistrationDto.getLatestTransactionStatusCode() - .equalsIgnoreCase(AbisConstant.RE_REGISTER)) { - regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), - LoggerFileConstant.REGISTRATIONID.toString(), registrationStatusDto.getRegistrationId(), - DemoDedupeConstants.REJECTED_OR_REREGISTER); - } else if (potentialMatchRegistrationDto.getLatestTransactionStatusCode() - .equalsIgnoreCase(RegistrationTransactionStatusCode.IN_PROGRESS.toString()) - || potentialMatchRegistrationDto.getLatestTransactionStatusCode() - .equalsIgnoreCase(RegistrationTransactionStatusCode.PROCESSED.toString())) { - String latestTransactionId = getLatestTransactionId(registrationStatusDto.getRegistrationId(), + for (DemographicInfoDto demographicInfoDto : duplicateDtos) { + InternalRegistrationStatusDto potentialMatchRegistrationDto = registrationStatusService + .getRegistrationStatus(demographicInfoDto.getRegId(), registrationStatusDto.getRegistrationType(), registrationStatusDto.getIteration(), registrationStatusDto.getWorkflowInstanceId()); - RegDemoDedupeListDto regDemoDedupeListDto = new RegDemoDedupeListDto(); - regDemoDedupeListDto.setRegId(registrationStatusDto.getRegistrationId()); - regDemoDedupeListDto.setMatchedRegId(demographicInfoDto.getRegId()); - regDemoDedupeListDto.setRegtrnId(latestTransactionId); - regDemoDedupeListDto.setIsDeleted(Boolean.FALSE); - regDemoDedupeListDto.setCrBy(DemoDedupeConstants.CREATED_BY); - packetInfoManager.saveDemoDedupePotentialData(regDemoDedupeListDto, moduleId, moduleName); - // You may need to handle isDataSaved and numberOfProcessedPackets in a thread-safe way - } else { - regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), - LoggerFileConstant.REGISTRATIONID.toString(), registrationStatusDto.getRegistrationId(), - "The packet status is something different"); - } - }); + if (potentialMatchRegistrationDto.getLatestTransactionStatusCode() + .equalsIgnoreCase(RegistrationTransactionStatusCode.REPROCESS.toString()) + || potentialMatchRegistrationDto.getLatestTransactionStatusCode() + .equalsIgnoreCase(AbisConstant.RE_REGISTER)) { + regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), + LoggerFileConstant.REGISTRATIONID.toString(), registrationStatusDto.getRegistrationId(), + DemoDedupeConstants.REJECTED_OR_REREGISTER); + } else if (potentialMatchRegistrationDto.getLatestTransactionStatusCode() + .equalsIgnoreCase(RegistrationTransactionStatusCode.IN_PROGRESS.toString()) + || potentialMatchRegistrationDto.getLatestTransactionStatusCode() + .equalsIgnoreCase(RegistrationTransactionStatusCode.PROCESSED.toString())) { + String latestTransactionId = getLatestTransactionId(registrationStatusDto.getRegistrationId(), + registrationStatusDto.getRegistrationType(), registrationStatusDto.getIteration(), registrationStatusDto.getWorkflowInstanceId()); + RegDemoDedupeListDto regDemoDedupeListDto = new RegDemoDedupeListDto(); + regDemoDedupeListDto.setRegId(registrationStatusDto.getRegistrationId()); + regDemoDedupeListDto.setMatchedRegId(demographicInfoDto.getRegId()); + regDemoDedupeListDto.setRegtrnId(latestTransactionId); + regDemoDedupeListDto.setIsDeleted(Boolean.FALSE); + regDemoDedupeListDto.setCrBy(DemoDedupeConstants.CREATED_BY); + packetInfoManager.saveDemoDedupePotentialData(regDemoDedupeListDto, moduleId, moduleName); + isDataSaved = true; + numberOfProcessedPackets++; + } else { + regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), + LoggerFileConstant.REGISTRATIONID.toString(), registrationStatusDto.getRegistrationId(), + "The packet status is something different"); + } if (numberOfProcessedPackets == 0) { object.setIsValid(Boolean.TRUE); } + } return isDataSaved; } diff --git a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/test/java/io/mosip/registrationprocessor/stages/demodedupe/DemoDedupeTest.java b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/test/java/io/mosip/registrationprocessor/stages/demodedupe/DemoDedupeTest.java index 34f3ba1dc17..a0af9e00c56 100644 --- a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/test/java/io/mosip/registrationprocessor/stages/demodedupe/DemoDedupeTest.java +++ b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/src/test/java/io/mosip/registrationprocessor/stages/demodedupe/DemoDedupeTest.java @@ -10,7 +10,6 @@ import org.apache.commons.io.IOUtils; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; @@ -120,7 +119,6 @@ public void setUp() throws Exception { /** * Test dedupe duplicate found. */ - @Ignore @Test public void testDedupeDuplicateFound() { String regId = "1234567890"; @@ -142,7 +140,6 @@ public void testDedupeDuplicateFound() { /** * Test demodedupe empty. */ - @Ignore @Test public void testDemodedupeEmpty() { diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml index 04e03f38ed5..1c1835a87bb 100644 --- a/registration-processor/pom.xml +++ b/registration-processor/pom.xml @@ -137,7 +137,7 @@ 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT - 1.2.1-SNAPSHOT + 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT diff --git a/registration-processor/registration-processor-common-camel-bridge/Dockerfile b/registration-processor/registration-processor-common-camel-bridge/Dockerfile index 2fb09904a0a..42a987c0b86 100644 --- a/registration-processor/registration-processor-common-camel-bridge/Dockerfile +++ b/registration-processor/registration-processor-common-camel-bridge/Dockerfile @@ -102,4 +102,4 @@ RUN find target/ -regextype posix-extended -regex '.*registration-processor-comm USER ${container_user_uid}:${container_user_gid} CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -XX:+ExplicitGCInvokesConcurrent -XX:+UseZGC -XX:+ZGenerational -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dregistration.processor.zone="${zone_env}" -jar registration-processor-common-camel-bridge.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dregistration.processor.zone="${zone_env}" -jar registration-processor-common-camel-bridge.jar ; \ diff --git a/registration-processor/registration-processor-info-storage-service/src/main/java/io/mosip/registration/processor/packet/storage/dao/PacketInfoDao.java b/registration-processor/registration-processor-info-storage-service/src/main/java/io/mosip/registration/processor/packet/storage/dao/PacketInfoDao.java index 7b731f8d98f..f19ef8b3379 100644 --- a/registration-processor/registration-processor-info-storage-service/src/main/java/io/mosip/registration/processor/packet/storage/dao/PacketInfoDao.java +++ b/registration-processor/registration-processor-info-storage-service/src/main/java/io/mosip/registration/processor/packet/storage/dao/PacketInfoDao.java @@ -4,11 +4,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import io.mosip.registration.processor.status.entity.RegistrationStatusEntity; -import lombok.Data; -import lombok.NoArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -212,53 +209,6 @@ private List getAllDemographicEntities(String params.put("isActive", IS_ACTIVE_TRUE); return demographicDedupeRepository.createQuerySelect(query.toString(), params); } - public List getAllDemographicInfoDtosBatch(List params) { - if (params == null || params.isEmpty()) { - return List.of(); - } - - // Build JPQL query with OR blocks for each param set - StringBuilder query = new StringBuilder(); - query.append("SELECT e FROM IndividualDemographicDedupeEntity e WHERE e.isActive = true AND ("); - - Map paramMap = new HashMap<>(); - for (int i = 0; i < params.size(); i++) { - NameGenderDobLangCode p = params.get(i); - query.append("(e.name = :name").append(i) - .append(" AND e.gender = :gender").append(i) - .append(" AND e.dob = :dob").append(i) - .append(" AND e.id.langCode = :langCode").append(i).append(")"); - if (i < params.size() - 1) query.append(" OR "); - - paramMap.put("name" + i, p.getName()); - paramMap.put("gender" + i, p.getGenderCode()); - paramMap.put("dob" + i, p.getDob()); - paramMap.put("langCode" + i, p.getLangCode()); - } - query.append(")"); - - List entities = - demographicDedupeRepository.createQuerySelect(query.toString(), paramMap); - - // Convert entities to DTOs - return entities.stream().map(this::convertEntityToDemographicDto).collect(Collectors.toList()); - } - - @Data - @NoArgsConstructor - public static class NameGenderDobLangCode { - private String name; - private String genderCode; - private String dob; - private String langCode; - - public NameGenderDobLangCode(String name, String genderCode, String dob, String langCode) { - this.name = name; - this.genderCode = genderCode; - this.dob = dob; - this.langCode = langCode; - } - } /** * Gets the all demographic info dtos. diff --git a/registration-processor/registration-processor-landing-zone/Dockerfile b/registration-processor/registration-processor-landing-zone/Dockerfile index 43d5f8d0cf5..9a27a063cdc 100644 --- a/registration-processor/registration-processor-landing-zone/Dockerfile +++ b/registration-processor/registration-processor-landing-zone/Dockerfile @@ -79,4 +79,4 @@ RUN chown -R ${container_user}:${container_user} /home/${container_user} USER ${container_user_uid}:${container_user_gid} CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -XX:+ExplicitGCInvokesConcurrent -XX:+UseZGC -XX:+ZGenerational -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -jar registration-processor-landing-zone.jar; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -jar registration-processor-landing-zone.jar; \ diff --git a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dao/RegistrationStatusDao.java b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dao/RegistrationStatusDao.java index added9e8081..f163a009799 100644 --- a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dao/RegistrationStatusDao.java +++ b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/dao/RegistrationStatusDao.java @@ -219,10 +219,6 @@ public Boolean checkUinAvailabilityForRid(String rid) { } - public List getProcessedRegIds(List regIds) { - return registrationStatusRepositary.findProcessedRegIds(regIds, RegistrationStatusCode.PROCESSED.toString()); - } - /** * Gets the by ids. * diff --git a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/repositary/RegistrationRepositary.java b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/repositary/RegistrationRepositary.java index 1aca846e7c2..7252b349138 100644 --- a/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/repositary/RegistrationRepositary.java +++ b/registration-processor/registration-processor-registration-status-service-impl/src/main/java/io/mosip/registration/processor/status/repositary/RegistrationRepositary.java @@ -46,7 +46,7 @@ public List getProcessedOrProcessingRegIds(@Param("regIds") List @Query("SELECT registration FROM RegistrationStatusEntity registration WHERE registration.regId = :regId AND registration.statusCode = :statusCode ") public List findByRegIdANDByStatusCode(@Param("regId") String regId,@Param("statusCode") String statusCode); - + @Query("SELECT registration FROM RegistrationStatusEntity registration WHERE registration.id.workflowInstanceId = :workflowInstanceId AND registration.isDeleted =false AND registration.isActive=true") public List findByWorkflowInstanceId(@Param("workflowInstanceId") String workflowInstanceId); @@ -61,8 +61,5 @@ public List getProcessedOrProcessingRegIds(@Param("regIds") List @Query(value ="SELECT * FROM registration r WHERE r.status_code =:statusCode order by r.upd_dtimes LIMIT :fetchSize ", nativeQuery = true) public List getResumablePackets(@Param("statusCode") String statusCode,@Param("fetchSize") Integer fetchSize); - - @Query("SELECT r.regId FROM RegistrationStatusEntity r WHERE r.regId IN :rids AND r.statusCode = :statusCode") - List findProcessedRegIds(@Param("rids") List rids, @Param("statusCode") String statusCode); } diff --git a/registration-processor/stage-groups/registration-processor-stage-group-1/Dockerfile b/registration-processor/stage-groups/registration-processor-stage-group-1/Dockerfile index 2ccb42829f1..278896d6afd 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-1/Dockerfile +++ b/registration-processor/stage-groups/registration-processor-stage-group-1/Dockerfile @@ -90,4 +90,4 @@ USER ${container_user_uid}:${container_user_gid} CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ wget --no-parent "${artifactory_url_env}"/"${regproc_jars_env}" --directory-prefix "${loader_path_env}"/ ; \ - java -XX:+UseZGC -XX:+ZGenerational -XX:+ExplicitGCInvokesConcurrent -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \ diff --git a/registration-processor/stage-groups/registration-processor-stage-group-2/Dockerfile b/registration-processor/stage-groups/registration-processor-stage-group-2/Dockerfile index 6db3bd94bc6..0d82ebf1e50 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-2/Dockerfile +++ b/registration-processor/stage-groups/registration-processor-stage-group-2/Dockerfile @@ -101,4 +101,4 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -XX:+UseZGC -XX:+ZGenerational -XX:+ExplicitGCInvokesConcurrent -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.io.Reader=ALL-UNNAMED --add-opens java.base/java.util.Optional=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED -jar ${group_name}.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.io.Reader=ALL-UNNAMED --add-opens java.base/java.util.Optional=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED -jar ${group_name}.jar ; \ diff --git a/registration-processor/stage-groups/registration-processor-stage-group-3/Dockerfile b/registration-processor/stage-groups/registration-processor-stage-group-3/Dockerfile index 4cf442be7c1..93165423824 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-3/Dockerfile +++ b/registration-processor/stage-groups/registration-processor-stage-group-3/Dockerfile @@ -86,4 +86,4 @@ RUN chown -R ${container_user}:${container_user} /home/${container_user} USER ${container_user_uid}:${container_user_gid} CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -XX:+UseZGC -XX:+ZGenerational -XX:+ExplicitGCInvokesConcurrent -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \ diff --git a/registration-processor/stage-groups/registration-processor-stage-group-4/Dockerfile b/registration-processor/stage-groups/registration-processor-stage-group-4/Dockerfile index 97040a1e06e..622b75e58c5 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-4/Dockerfile +++ b/registration-processor/stage-groups/registration-processor-stage-group-4/Dockerfile @@ -101,4 +101,4 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -XX:+UseZGC -XX:+ZGenerational -XX:+ExplicitGCInvokesConcurrent -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.io.Reader=ALL-UNNAMED --add-opens java.base/java.util.Optional=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED -jar ${group_name}.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.io.Reader=ALL-UNNAMED --add-opens java.base/java.util.Optional=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED -jar ${group_name}.jar ; \ diff --git a/registration-processor/stage-groups/registration-processor-stage-group-5/Dockerfile b/registration-processor/stage-groups/registration-processor-stage-group-5/Dockerfile index a4df3a6974d..4b386577dc2 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-5/Dockerfile +++ b/registration-processor/stage-groups/registration-processor-stage-group-5/Dockerfile @@ -98,4 +98,4 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -XX:+UseZGC -XX:+ZGenerational -XX:+ExplicitGCInvokesConcurrent -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.io.Reader=ALL-UNNAMED --add-opens java.base/java.util.Optional=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED -jar ${group_name}.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.io.Reader=ALL-UNNAMED --add-opens java.base/java.util.Optional=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED -jar ${group_name}.jar ; \ diff --git a/registration-processor/stage-groups/registration-processor-stage-group-6/Dockerfile b/registration-processor/stage-groups/registration-processor-stage-group-6/Dockerfile index d313588a49a..919f2de1861 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-6/Dockerfile +++ b/registration-processor/stage-groups/registration-processor-stage-group-6/Dockerfile @@ -92,4 +92,4 @@ USER ${container_user_uid}:${container_user_gid} CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ wget --no-parent "${artifactory_url_env}"/"${regproc_jars_env}" --directory-prefix "${loader_path_env}"/ ; \ - java -XX:+UseZGC -XX:+ZGenerational -XX:+ExplicitGCInvokesConcurrent -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \ diff --git a/registration-processor/stage-groups/registration-processor-stage-group-7/Dockerfile b/registration-processor/stage-groups/registration-processor-stage-group-7/Dockerfile index 4bbbaed6ec4..6430d280802 100644 --- a/registration-processor/stage-groups/registration-processor-stage-group-7/Dockerfile +++ b/registration-processor/stage-groups/registration-processor-stage-group-7/Dockerfile @@ -86,4 +86,4 @@ RUN chown -R ${container_user}:${container_user} /home/${container_user} USER ${container_user_uid}:${container_user_gid} CMD wget "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ - java -XX:+UseZGC -XX:+ZGenerational -XX:+ExplicitGCInvokesConcurrent -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \ + java -XX:-UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:-UseParallelGC -XX:+UseZGC -XX:+ZGenerational -XX:-UseShenandoahGC -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseCompressedOops -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}" -Dstage-group-name=${group_name} -jar ${group_name}.jar ; \