diff --git a/pom.xml b/pom.xml index a15dfc50..05a7a815 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,8 @@ reuseReports ${project.basedir}/../target/jacoco.exec java + true + diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java index 83c5dcfe..1624dde4 100644 --- a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java +++ b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java @@ -48,7 +48,7 @@ */ @RestController @RequestMapping(value = "/dataSyncActivity", headers = "Authorization", consumes = "application/json", produces = "application/json") -@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') ") +@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') || hasRole('NURSE') ") public class StartSyncActivity { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java b/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java index 2a9f3450..d8011895 100644 --- a/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java +++ b/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java @@ -48,7 +48,7 @@ */ @RestController @RequestMapping(value = "/dataSync", headers = "Authorization") -@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') ") +@PreAuthorize("hasRole('DATASYNC') || hasRole('DATA_SYNC') || hasRole('NURSE') ") public class MMUDataSyncVanToServer { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java index ad6f844a..8d1ce69e 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java @@ -444,7 +444,7 @@ private boolean performGenericTableSync(SyncUploadDataDigester syncUploadDataDig List currentRecordValues = new ArrayList<>(); for (String column : serverColumnsList) { - logger.info("Column="+column); + logger.debug("Column="+column); Object value = cleanRecord.get(column.trim()); // CRITICAL FIX: Don't convert null to string if (value == null) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c2e28213..d1f926a2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -56,13 +56,8 @@ logging.level.org.apache.tomcat.jdbc.pool=DEBUG # Connection timeout - time to establish connection spring.mvc.async.request-timeout=600000 -# HTTP client timeouts for RestTemplate -rest.connection.timeout=60000 -rest.read.timeout=600000 -rest.socket.timeout=600000 - -# ============= SERVER TIMEOUT ============= -# Tomcat connection timeout -server.connection-timeout=600000 -server.tomcat.connection-timeout=600000 +# ============= SERVER TIMEOUT (Undertow) ============= +# Undertow settings (the actual server in use - WildFly/JBoss) +server.undertow.no-request-timeout=600000 +server.undertow.max-http-post-size=-1